| commit | 70fec392ec11161e6c2d972f823830e960364cfd | [log] [tgz] |
|---|---|---|
| author | Steven Ng <stevenckng@google.com> | Fri Apr 14 09:41:28 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 14 09:41:28 2023 +0000 |
| tree | 8aa990cccd02a4ae9c24cf265219f6be9067a0fb | |
| parent | 1c4d0f420c3df0370084c0b25ce6f44d287910f1 [diff] | |
| parent | 4b2a6023638afbe63c273a6d05a5508bf9572a18 [diff] |
Merge "Add FLAG_UPDATE_CURRENT flag when creating app bubble pending intent" into udc-dev am: ee8b87bd99 am: 4b2a602363 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22603989 Change-Id: Id56abfe53c8dd497a131ffd12098d6894bb1267e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java index a317c44..684a23a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java
@@ -246,7 +246,7 @@ mBubble.getAppBubbleIntent() .addFlags(FLAG_ACTIVITY_NEW_DOCUMENT) .addFlags(FLAG_ACTIVITY_MULTIPLE_TASK), - PendingIntent.FLAG_IMMUTABLE, + PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT, /* options= */ null); mTaskView.startActivity(pi, /* fillInIntent= */ null, options, launchBounds);