Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make system-generated FGS notification PendingIntents immutable" into rvc-qpr-dev am: 895dbfa8ef

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11708354

Change-Id: I0a30217ea8698905e4c5879d3fc7c3ba9622e0ea
This commit is contained in:
TreeHugger Robot
2020-08-06 21:10:30 +00:00
committed by Automerger Merge Worker
parent 7ce562e5c1 895dbfa8ef
commit 1d95dc53bc
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/ServiceRecord.java
View File

@@ -16,6 +16,9 @@
package com.android.server.am; 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_AM;
import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME; 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", runningIntent.setData(Uri.fromParts("package",
appInfo.packageName, null)); appInfo.packageName, null));
PendingIntent pi = PendingIntent.getActivityAsUser(ams.mContext, 0, PendingIntent pi = PendingIntent.getActivityAsUser(ams.mContext, 0,
runningIntent, PendingIntent.FLAG_UPDATE_CURRENT, null, runningIntent, FLAG_UPDATE_CURRENT | FLAG_IMMUTABLE, null,
UserHandle.of(userId)); UserHandle.of(userId));
notiBuilder.setColor(ams.mContext.getColor( notiBuilder.setColor(ams.mContext.getColor(
com.android.internal com.android.internal