diff options
| author | 2023-01-06 22:54:18 +0000 | |
|---|---|---|
| committer | 2023-01-06 22:54:18 +0000 | |
| commit | 75e703a7bdd3d8e538fd3810bc0a48313199c8a6 (patch) | |
| tree | 80b1b25b0df952b0cf92cae76a3189e0715ca51a | |
| parent | 71a037c25d0ab294d512382a8aa8cf515a12e1c6 (diff) | |
| parent | c25019ff07cdd2421788716d8d3cd89a7f8d9586 (diff) | |
Merge "[Bugfix]create different pendingintent via appwidgetId" am: 71a5559a8b am: c25019ff07
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2370509
Change-Id: I46499071a6b68ec4749defc1bc8a376942c85ca4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java index 4430bb4b3292..308f36029e02 100644 --- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java +++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java @@ -579,12 +579,6 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku } } - if (onClickIntent != null) { - views.setOnClickPendingIntent(android.R.id.background, - PendingIntent.getActivity(mContext, 0, onClickIntent, - PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE)); - } - Icon icon = appInfo.icon != 0 ? Icon.createWithResource(appInfo.packageName, appInfo.icon) : Icon.createWithResource(mContext, android.R.drawable.sym_def_app_icon); @@ -596,6 +590,12 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku for (int j = 0; j < widgetCount; j++) { Widget widget = provider.widgets.get(j); if (targetWidget != null && targetWidget != widget) continue; + if (onClickIntent != null) { + views.setOnClickPendingIntent(android.R.id.background, + PendingIntent.getActivity(mContext, widget.appWidgetId, onClickIntent, + PendingIntent.FLAG_UPDATE_CURRENT + | PendingIntent.FLAG_IMMUTABLE)); + } if (widget.replaceWithMaskedViewsLocked(views)) { scheduleNotifyUpdateAppWidgetLocked(widget, widget.getEffectiveViewsLocked()); } |