Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d95dc53 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make system-generated FGS notification PendingIntents immutable" into... 

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

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

Change-Id: I0a30217ea8698905e4c5879d3fc7c3ba9622e0ea
parents 7ce562e5 895dbfa8

services/core/java/com/android/server/am/ServiceRecord.java

+4 −1
Original line number Diff line number Diff line
@@ -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