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

Commit dbc85e3d authored by Pinyao Ting's avatar Pinyao Ting Committed by Automerger Merge Worker
Browse files

Merge "Refrain from returning mutable pending intent in getShortcutIntent"... 

Merge "Refrain from returning mutable pending intent in getShortcutIntent" into sc-dev am: c4adbc27 am: 14941402

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

Change-Id: I7f56753f755e1b919bb2bbebd99cc7bcdea2918f
parents 067417bb 14941402

services/core/java/com/android/server/pm/LauncherAppsService.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.server.pm; 




import static android.app.ActivityOptions.KEY_SPLASH_SCREEN_THEME;

import static android.app.ActivityOptions.KEY_SPLASH_SCREEN_THEME;

import static android.app.PendingIntent.FLAG_IMMUTABLE;

import static android.app.PendingIntent.FLAG_IMMUTABLE;

import static android.app.PendingIntent.FLAG_MUTABLE;

import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;

import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;

import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;

import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT;

import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT;

import static android.content.pm.LauncherApps.FLAG_CACHE_BUBBLE_SHORTCUTS;

import static android.content.pm.LauncherApps.FLAG_CACHE_BUBBLE_SHORTCUTS;
@@ -704,7 +704,8 @@ public class LauncherAppsService extends SystemService { 
            final long ident = Binder.clearCallingIdentity();

            final long ident = Binder.clearCallingIdentity();

            try {

            try {

                return injectCreatePendingIntent(0 /* requestCode */, intents,

                return injectCreatePendingIntent(0 /* requestCode */, intents,

                        FLAG_MUTABLE, opts, packageName, mPackageManagerInternal.getPackageUid(

                        FLAG_IMMUTABLE | FLAG_UPDATE_CURRENT, opts, packageName,

                        mPackageManagerInternal.getPackageUid(

                                packageName, PackageManager.MATCH_DIRECT_BOOT_AUTO,

                                packageName, PackageManager.MATCH_DIRECT_BOOT_AUTO,

                                user.getIdentifier()));

                                user.getIdentifier()));

            } finally {

            } finally {