From 68d26be719072c029b37ae15f17b8137e8429e38 Mon Sep 17 00:00:00 2001 From: Henrik Baard Date: Thu, 11 Jul 2013 10:42:26 +0200 Subject: [PATCH] Early return in RemoteViewsAdapter is too late The constuctor RemoteViewsAdapter implements an early return throwing an exception if intent is null. However the intent is used before it is checked. Moving early return before use of the intent. Change-Id: If847245b3b9f21111805f301717080c81474cad7 --- core/java/android/widget/RemoteViewsAdapter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/java/android/widget/RemoteViewsAdapter.java b/core/java/android/widget/RemoteViewsAdapter.java index 56bdb9ba4b0ef..5eaf20c54f11b 100644 --- a/core/java/android/widget/RemoteViewsAdapter.java +++ b/core/java/android/widget/RemoteViewsAdapter.java @@ -817,12 +817,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