commit a27a4ecab28c8a28af68a2e49b47c0c8782c2f70
author George Chang <georgekgchang@google.com> Thu Jul 30 14:41:48 2020 +0800
committer android-build-team Robot <android-build-team-robot@google.com> Wed Sep 30 00:06:30 2020 +0000
tree 71242269e32464bc3431b469e0bdab3b1a95a425
parent 636c48be0470fe2d7c4dc497da94a1ca9ad6d927

Ensure pending intent on beam notification is immutable

Bug: 159060474
Test: manual
Change-Id: I90b5212651eb88b06db266a4e6a23b8baefaf47e
(cherry picked from commit fc0910a24b2e724f4177008e0962b47a682263ce)

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);
             }