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

Commit 10a2efee authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Backup SystemUI as system user" into tm-qpr-dev am: e50b8859 am: e03dc901 

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



Change-Id: Ie04a12e4dcfc1c3b2001e0281dca65224c83edd9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fa583f8a e03dc901

services/core/java/com/android/server/am/ActivityManagerService.java

+4 −2
Original line number Diff line number Diff line
@@ -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;