Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 568ebf06 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by Android Git Automerger
Browse files

am cf492afd: Merge change 6809 into donut 

Merge commit 'cf492afd'

* commit 'cf492afd':
  Correctly deliver AppWidgetProvider.onDeleted() events.
parents 97900afa cf492afd

core/java/android/appwidget/AppWidgetProvider.java

+3 −5
Original line number Diff line number Diff line
@@ -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)) {