commit 842d9de74f9eaaf8a7b89dbe8475faf014ddafb8
author Adam Cohen <adamcohen@google.com> Wed Aug 17 11:39:32 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 17 11:39:32 2011 -0700
tree 542da79ed346782aabd5cfbf6862bbd043ef47af
parent e117d0bda12f02e39b58b6460bee0aaf8ead9cf9
parent bac26a1205883ad30343f1d1f64a039dcdda9f63

Merge "Getting rid of the (hidden) oldName parameter for widgets"

core/java/android/appwidget/AppWidgetManager.java

diff --git a/core/java/android/appwidget/AppWidgetManager.java b/core/java/android/appwidget/AppWidgetManager.java
index 1ef99a1..09661a5 100644
--- a/core/java/android/appwidget/AppWidgetManager.java
+++ b/core/java/android/appwidget/AppWidgetManager.java
@@ -184,16 +184,6 @@
      */
     public static final String META_DATA_APPWIDGET_PROVIDER = "android.appwidget.provider";
 
-    /**
-     * Field for the manifest meta-data tag used to indicate any previous name for the
-     * app widget receiver.
-     *
-     * @see AppWidgetProviderInfo
-     *
-     * @hide Pending API approval
-     */
-    public static final String META_DATA_APPWIDGET_OLD_NAME = "android.appwidget.oldName";
-
     static WeakHashMap<Context, WeakReference<AppWidgetManager>> sManagerCache =
         new WeakHashMap<Context, WeakReference<AppWidgetManager>>();
     static IAppWidgetService sService;

core/java/android/appwidget/AppWidgetProviderInfo.java

diff --git a/core/java/android/appwidget/AppWidgetProviderInfo.java b/core/java/android/appwidget/AppWidgetProviderInfo.java
index 9c352d5..c33681d 100644
--- a/core/java/android/appwidget/AppWidgetProviderInfo.java
+++ b/core/java/android/appwidget/AppWidgetProviderInfo.java
@@ -138,17 +138,6 @@
     public int icon;
 
     /**
-     * The previous name, if any, of the app widget receiver. If not supplied, it will be
-     * ignored.
-     *
-     * <p>This field corresponds to the <code>&lt;meta-data /&gt;</code> with the name
-     * <code>android.appwidget.oldName</code>.
-     * 
-     * @hide Pending API approval
-     */
-    public String oldName;
-
-    /**
      * The view id of the AppWidget subview which should be auto-advanced by the widget's host.
      *
      * <p>This field corresponds to the <code>android:autoAdvanceViewId</code> attribute in

services/java/com/android/server/AppWidgetService.java

diff --git a/services/java/com/android/server/AppWidgetService.java b/services/java/com/android/server/AppWidgetService.java
index a679ca7..f5fd6bd 100644
--- a/services/java/com/android/server/AppWidgetService.java
+++ b/services/java/com/android/server/AppWidgetService.java
@@ -817,11 +817,10 @@
     }
 
     Provider lookupProviderLocked(ComponentName provider) {
-        final String className = provider.getClassName();
         final int N = mInstalledProviders.size();
         for (int i=0; i<N; i++) {
             Provider p = mInstalledProviders.get(i);
-            if (p.info.provider.equals(provider) || className.equals(p.info.oldName)) {
+            if (p.info.provider.equals(provider)) {
                 return p;
             }
         }
@@ -1006,11 +1005,6 @@
 
             p = new Provider();
             AppWidgetProviderInfo info = p.info = new AppWidgetProviderInfo();
-            // If metaData was null, we would have returned earlier when getting
-            // the parser No need to do the check here
-            info.oldName = activityInfo.metaData.getString(
-                    AppWidgetManager.META_DATA_APPWIDGET_OLD_NAME);
-
             info.provider = component;
             p.uid = activityInfo.applicationInfo.uid;