diff options
| -rw-r--r-- | core/java/android/appwidget/AppWidgetManager.java | 10 | ||||
| -rw-r--r-- | core/java/android/appwidget/AppWidgetProviderInfo.java | 11 | ||||
| -rw-r--r-- | services/java/com/android/server/AppWidgetService.java | 8 |
3 files changed, 1 insertions, 28 deletions
diff --git a/core/java/android/appwidget/AppWidgetManager.java b/core/java/android/appwidget/AppWidgetManager.java index 1ef99a1e6845..09661a59334c 100644 --- a/core/java/android/appwidget/AppWidgetManager.java +++ b/core/java/android/appwidget/AppWidgetManager.java @@ -184,16 +184,6 @@ public class AppWidgetManager { */ 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; diff --git a/core/java/android/appwidget/AppWidgetProviderInfo.java b/core/java/android/appwidget/AppWidgetProviderInfo.java index 9c352d58dfb2..c33681d65941 100644 --- a/core/java/android/appwidget/AppWidgetProviderInfo.java +++ b/core/java/android/appwidget/AppWidgetProviderInfo.java @@ -138,17 +138,6 @@ public class AppWidgetProviderInfo implements Parcelable { 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><meta-data /></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 diff --git a/services/java/com/android/server/AppWidgetService.java b/services/java/com/android/server/AppWidgetService.java index a679ca72daa2..f5fd6bd866a5 100644 --- a/services/java/com/android/server/AppWidgetService.java +++ b/services/java/com/android/server/AppWidgetService.java @@ -817,11 +817,10 @@ class AppWidgetService extends IAppWidgetService.Stub } 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 @@ class AppWidgetService extends IAppWidgetService.Stub 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; |