diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-29 08:34:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-29 08:34:40 +0000 |
| commit | 987698411473b3f8a1d29d88491d0a4dccf96706 (patch) | |
| tree | 8a85f9c1ca0bc8d8c2671a06fb2f793fa8b853f2 | |
| parent | 248c0072ebcf4cbccb5d5e6b89860e5bb494e006 (diff) | |
| parent | 5077c06bff096b4bda173dcf50bc0c3fac32051e (diff) | |
| download | Nfc-987698411473b3f8a1d29d88491d0a4dccf96706.tar.gz | |
Merge "Ensure pending intent on beam notification is immutable" into oc-dev am: a45b7e4a6f am: 6977d45586 am: 19c33afaa6 am: b7e5ab8782 am: 81897e1c5a am: 5077c06bff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/12265009
Change-Id: I08a6b31ff9268aab0a80f914eab3272d5bd5ff2f
| -rw-r--r-- | src/com/android/nfc/beam/BeamTransferManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/nfc/beam/BeamTransferManager.java b/src/com/android/nfc/beam/BeamTransferManager.java index eff9d6b5..c8a48a10 100644 --- a/src/com/android/nfc/beam/BeamTransferManager.java +++ b/src/com/android/nfc/beam/BeamTransferManager.java @@ -343,7 +343,8 @@ public class BeamTransferManager implements Handler.Callback, notBuilder.setContentText(mContext.getString(R.string.beam_tap_to_view)); Intent viewIntent = buildViewIntent(); PendingIntent contentIntent = PendingIntent.getActivity( - mContext, mTransferId, viewIntent, 0, null); + mContext, mTransferId, viewIntent, + PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE, null); notBuilder.setContentIntent(contentIntent); } |