Changing app widget "extras" to "options" and another small API Review issue

-> (issue 6427146), (issue 6427861)

Change-Id: Ib69a9b3717a5b62317ec227936bc3b2fd5954043
diff --git a/services/java/com/android/server/AppWidgetService.java b/services/java/com/android/server/AppWidgetService.java
index 7e71b08..38f4554 100644
--- a/services/java/com/android/server/AppWidgetService.java
+++ b/services/java/com/android/server/AppWidgetService.java
@@ -279,13 +279,13 @@
     }
 
     @Override
-    public void updateAppWidgetExtras(int appWidgetId, Bundle extras) {
-        getImplForUser().updateAppWidgetExtras(appWidgetId, extras);
+    public void updateAppWidgetOptions(int appWidgetId, Bundle options) {
+        getImplForUser().updateAppWidgetOptions(appWidgetId, options);
     }
 
     @Override
-    public Bundle getAppWidgetExtras(int appWidgetId) {
-        return getImplForUser().getAppWidgetExtras(appWidgetId);
+    public Bundle getAppWidgetOptions(int appWidgetId) {
+        return getImplForUser().getAppWidgetOptions(appWidgetId);
     }
 
     static int[] getAppWidgetIds(Provider p) {