commit 69c5f4aff63d9d4c72e33a1352ce08e00853bcc5
author android-build-prod (mdb) <android-build-team-robot@google.com> Tue Nov 03 21:10:01 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 03 21:10:01 2020 +0000
tree 8a85f9c1ca0bc8d8c2671a06fb2f793fa8b853f2
parent 53a203c84c2f4e227af040e0ab0fc1bc2ec61a78
parent efb2c216e64d245281da39924a464d2f62c38ac8

Merge "Snap for 6949450 from cba6948efcd2cb6d85309f98e5b4698f41a6b0bf to android11-tests-release" into android11-tests-release

src/com/android/nfc/beam/BeamTransferManager.java

diff --git a/src/com/android/nfc/beam/BeamTransferManager.java b/src/com/android/nfc/beam/BeamTransferManager.java
index eff9d6b..c8a48a1 100644
--- a/src/com/android/nfc/beam/BeamTransferManager.java
+++ b/src/com/android/nfc/beam/BeamTransferManager.java
@@ -343,7 +343,8 @@
                 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);
             }