Merge "Make system-generated FGS notification PendingIntents immutable" into rvc-qpr-dev

This commit is contained in:
TreeHugger Robot
2020-08-06 20:51:26 +00:00
committed by Android (Google) Code Review

View File

@@ -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