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

Commit d14f7f12 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 095428d2: am d15958f6: am 64c8a073: Merge "Early return in RemoteViewsAdapter is too late"

* commit '095428d2':
  Early return in RemoteViewsAdapter is too late
parents 0048b6e6 095428d2
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -815,12 +815,12 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback
        mContext = context;
        mIntent = intent;

        mAppWidgetId = intent.getIntExtra(RemoteViews.EXTRA_REMOTEADAPTER_APPWIDGET_ID, -1);

        mLayoutInflater = LayoutInflater.from(context);
        if (mIntent == null) {
            throw new IllegalArgumentException("Non-null Intent must be specified.");
        }

        mAppWidgetId = intent.getIntExtra(RemoteViews.EXTRA_REMOTEADAPTER_APPWIDGET_ID, -1);
        mLayoutInflater = LayoutInflater.from(context);
        mRequestedViews = new RemoteViewsFrameLayoutRefSet();

        // Strip the previously injected app widget id from service intent