diff options
| author | 2023-02-08 15:52:06 +0000 | |
|---|---|---|
| committer | 2023-02-08 15:52:06 +0000 | |
| commit | 10a2efee47d736144cb27bf90f95e1013d02e194 (patch) | |
| tree | e17d314de6a69a853dfbb5907b32b9cebe567e9e | |
| parent | fa583f8aca5e896a79c17f3b0dc3112eab4e1c08 (diff) | |
| parent | e03dc901bba570193f2255f1e55be7b7e7adc6e1 (diff) | |
Merge "Backup SystemUI as system user" into tm-qpr-dev am: e50b8859a1 am: e03dc901bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21318345
Change-Id: Ie04a12e4dcfc1c3b2001e0281dca65224c83edd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index bb73877bc785..c759af508379 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -13282,8 +13282,10 @@ public class ActivityManagerService extends IActivityManager.Stub // restored. This distinction is important for system-process packages that live in the // system user's process but backup/restore data for non-system users. // TODO (b/123688746): Handle all system-process packages with singleton check. - final int instantiatedUserId = - PLATFORM_PACKAGE_NAME.equals(packageName) ? UserHandle.USER_SYSTEM : targetUserId; + boolean useSystemUser = PLATFORM_PACKAGE_NAME.equals(packageName) + || getPackageManagerInternal().getSystemUiServiceComponent().getPackageName() + .equals(packageName); + final int instantiatedUserId = useSystemUser ? UserHandle.USER_SYSTEM : targetUserId; IPackageManager pm = AppGlobals.getPackageManager(); ApplicationInfo app = null; |