Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 6809 into donut

Browse Source 
* changes:
  Correctly deliver AppWidgetProvider.onDeleted() events.
This commit is contained in:
Android (Google) Code Review
2009-07-17 14:27:23 -07:00
parent e96bd12914 eda4be30a2
commit cf492afdeb
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/appwidget/AppWidgetProvider.java
View File

@@ -64,11 +64,9 @@ public class AppWidgetProvider extends BroadcastReceiver {
} }
else if (AppWidgetManager.ACTION_APPWIDGET_DELETED.equals(action)) { else if (AppWidgetManager.ACTION_APPWIDGET_DELETED.equals(action)) {
Bundle extras = intent.getExtras(); Bundle extras = intent.getExtras();
if (extras != null) { if (extras != null && extras.containsKey(AppWidgetManager.EXTRA_APPWIDGET_ID)) {
int[] appWidgetIds = extras.getIntArray(AppWidgetManager.EXTRA_APPWIDGET_IDS); final int appWidgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID);
if (appWidgetIds != null && appWidgetIds.length > 0) { this.onDeleted(context, new int[] { appWidgetId });
this.onDeleted(context, appWidgetIds);
}
} }
} }
else if (AppWidgetManager.ACTION_APPWIDGET_ENABLED.equals(action)) { else if (AppWidgetManager.ACTION_APPWIDGET_ENABLED.equals(action)) {