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

Merge "Early return in RemoteViewsAdapter is too late"

Browse Source
This commit is contained in:
Elliott Hughes
2015-04-01 23:34:24 +00:00
committed by Gerrit Code Review
parent 97467d82a3 68d26be719
commit 64c8a07345
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/widget/RemoteViewsAdapter.java
View File

@@ -817,12 +817,12 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback
mContext = context; mContext = context;
mIntent = intent; mIntent = intent;
mAppWidgetId = intent.getIntExtra(RemoteViews.EXTRA_REMOTEADAPTER_APPWIDGET_ID, -1);
mLayoutInflater = LayoutInflater.from(context);
if (mIntent == null) { if (mIntent == null) {
throw new IllegalArgumentException("Non-null Intent must be specified."); 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(); mRequestedViews = new RemoteViewsFrameLayoutRefSet();
// Strip the previously injected app widget id from service intent // Strip the previously injected app widget id from service intent