diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-11-03 21:10:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-11-03 21:10:01 +0000 |
| commit | 69c5f4aff63d9d4c72e33a1352ce08e00853bcc5 (patch) | |
| tree | 8a85f9c1ca0bc8d8c2671a06fb2f793fa8b853f2 | |
| parent | 53a203c84c2f4e227af040e0ab0fc1bc2ec61a78 (diff) | |
| parent | efb2c216e64d245281da39924a464d2f62c38ac8 (diff) | |
| download | Nfc-android11-tests-release.tar.gz | |
Merge "Snap for 6949450 from cba6948efcd2cb6d85309f98e5b4698f41a6b0bf to android11-tests-release" into android11-tests-releaseandroid-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android11-tests-release
| -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); } |