diff options
| author | Adam Cohen <adamcohen@google.com> | 2012-05-01 15:36:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-01 15:36:21 -0700 |
| commit | c9ca7f38bccfa56bbca44998758869ec8c71f4d3 (patch) | |
| tree | 4a84bef44251badc07caed6bb2afaada377d1184 /core/java/android | |
| parent | d72ad2ac88ae8477a95e18a800062446a58c524d (diff) | |
| parent | ffc46a5c7c60c911fdaab48681c323c89b570dac (diff) | |
Merge "Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)" into jb-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/widget/RemoteViews.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index e628bc1a4029..d8c23a17a9c8 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -22,6 +22,8 @@ import android.appwidget.AppWidgetHostView; import android.content.Context; import android.content.Intent; import android.content.IntentSender; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Configuration; import android.graphics.Bitmap; @@ -29,6 +31,7 @@ import android.graphics.PorterDuff; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -490,7 +493,14 @@ public class RemoteViews implements Parcelable, Filter { if (mIsWidgetCollectionChild) { Log.e("RemoteViews", "Cannot setOnClickPendingIntent for collection item " + "(id: " + viewId + ")"); - // TODO: return; We'll let this slide until apps are up to date. + ApplicationInfo appInfo = root.getContext().getApplicationInfo(); + + // We let this slide for HC and ICS so as to not break compatibility. It should have + // been disabled from the outset, but was left open by accident. + if (appInfo != null && + appInfo.targetSdkVersion >= Build.VERSION_CODES.JELLY_BEAN) { + return; + } } if (target != null) { |