diff options
| author | 2020-08-06 21:10:30 +0000 | |
|---|---|---|
| committer | 2020-08-06 21:10:30 +0000 | |
| commit | 1d95dc53bc7e6baf751c32019fbc6f838d58245a (patch) | |
| tree | 476c9680acb8a07b2166418cf791dc88398c93f1 | |
| parent | 7ce562e5c141b31849ae84eb8c18f91048d0a2b9 (diff) | |
| parent | 895dbfa8ef00df5b20daa395c6e9145d6ac5c2c1 (diff) | |
Merge "Make system-generated FGS notification PendingIntents immutable" into rvc-qpr-dev am: 895dbfa8ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11708354
Change-Id: I0a30217ea8698905e4c5879d3fc7c3ba9622e0ea
| -rw-r--r-- | services/core/java/com/android/server/am/ServiceRecord.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ServiceRecord.java b/services/core/java/com/android/server/am/ServiceRecord.java index fc17ddedb39f..828ac71eccfe 100644 --- a/services/core/java/com/android/server/am/ServiceRecord.java +++ b/services/core/java/com/android/server/am/ServiceRecord.java @@ -16,6 +16,9 @@ package com.android.server.am; +import static android.app.PendingIntent.FLAG_IMMUTABLE; +import static android.app.PendingIntent.FLAG_UPDATE_CURRENT; + import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM; import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME; @@ -873,7 +876,7 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN runningIntent.setData(Uri.fromParts("package", appInfo.packageName, null)); PendingIntent pi = PendingIntent.getActivityAsUser(ams.mContext, 0, - runningIntent, PendingIntent.FLAG_UPDATE_CURRENT, null, + runningIntent, FLAG_UPDATE_CURRENT | FLAG_IMMUTABLE, null, UserHandle.of(userId)); notiBuilder.setColor(ams.mContext.getColor( com.android.internal |