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

Merge "Backup SystemUI as system user" into tm-qpr-dev am: e50b8859a1 am: e03dc901bb

Browse Source 
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>
This commit is contained in:
Matt Pietal
2023-02-08 15:52:06 +00:00
committed by Automerger Merge Worker
parent fa583f8aca e03dc901bb
commit 10a2efee47
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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;