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

Merge "Refrain from returning mutable pending intent in getShortcutIntent" into sc-dev

Browse Source
This commit is contained in:
Pinyao Ting
2021-07-19 19:09:17 +00:00
committed by Android (Google) Code Review
parent 37ae9cfc89 f89e70d290
commit c4adbc278e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/pm/LauncherAppsService.java
View File

@@ -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;
@@ -699,7 +699,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 {