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

Commit b9ccfe55 authored by Christopher Tate's avatar Christopher Tate Committed by Chris Tate
Browse files

Make system-generated FGS notification PendingIntents immutable 

Bug: 153878498
Test: Test app from the indicated bug
Change-Id: Ied48bdfa4e168dad7d829dbe21cc441dfde868ae
(cherry picked from commit 0617b71c)
parent ad14c752

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;
@@ -864,7 +867,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