diff options
| -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 c89b236abac6..5b77ed160e6e 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -12766,8 +12766,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; |