diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-09-16 23:30:11 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-09-16 23:30:11 +0000 |
| commit | cba6948efcd2cb6d85309f98e5b4698f41a6b0bf (patch) | |
| tree | 8a85f9c1ca0bc8d8c2671a06fb2f793fa8b853f2 | |
| parent | 53a203c84c2f4e227af040e0ab0fc1bc2ec61a78 (diff) | |
| parent | a169b94cd130c88df3e5185edeffff6fe1bae2a0 (diff) | |
| download | platform_packages_apps_Nfc-android11-release.tar.gz platform_packages_apps_Nfc-android11-release.tar.bz2 platform_packages_apps_Nfc-android11-release.zip | |
Merge cherrypicks of [12620612, 12620613, 12620936, 12620457, 12616684, 12621005, 12620883, 12620884, 12620846, 12620847, 12620869, 12620848, 12620849, 12620961, 12620962, 12620827, 12620614, 12620197, 12620885, 12620198, 12621039, 12621040, 12621041, 12620937, 12620615, 12620886] into rvc-releaseandroid-11.0.0_r17android11-release
Change-Id: Ieb741a011259a9564f590a9c3871b30c5e3c9a3a
| -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); } |