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

am cf492afd: Merge change 6809 into donut

Browse Source 
Merge commit 'cf492afdeb3a1da04cc71518285eb778f2ef6837'

* commit 'cf492afdeb3a1da04cc71518285eb778f2ef6837':
  Correctly deliver AppWidgetProvider.onDeleted() events.
This commit is contained in:
Android (Google) Code Review
2009-07-17 17:13:24 -07:00
committed by Android Git Automerger
parent 97900afa9f cf492afdeb
commit 568ebf06bc
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)) {
Bundle extras = intent.getExtras();
if (extras != null) {
int[] appWidgetIds = extras.getIntArray(AppWidgetManager.EXTRA_APPWIDGET_IDS);
if (appWidgetIds != null && appWidgetIds.length > 0) {
this.onDeleted(context, appWidgetIds);
}
if (extras != null && extras.containsKey(AppWidgetManager.EXTRA_APPWIDGET_ID)) {
final int appWidgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID);
this.onDeleted(context, new int[] { appWidgetId });
}
}
else if (AppWidgetManager.ACTION_APPWIDGET_ENABLED.equals(action)) {