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

Commit aa739c54 authored by BK Choi's avatar BK Choi Committed by Automerger Merge Worker
Browse files

Merge "Allow SYSTEM user in Automotive instead of main user." into udc-qpr-dev... 

Merge "Allow SYSTEM user in Automotive instead of main user." into udc-qpr-dev am: eae7134d am: cbe62efc

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



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

services/core/java/com/android/server/PersistentDataBlockService.java

+3 −2
Original line number Diff line number Diff line
@@ -159,9 +159,10 @@ public class PersistentDataBlockService extends SystemService { 


    private int getAllowedUid() {

        final UserManagerInternal umInternal = LocalServices.getService(UserManagerInternal.class);

        final int mainUserId = umInternal.getMainUserId();

        int mainUserId = umInternal.getMainUserId();

        if (mainUserId < 0) {

            return -1;

            // If main user is not defined. Use the SYSTEM user instead.

            mainUserId = UserHandle.USER_SYSTEM;

        }

        String allowedPackage = mContext.getResources()

                .getString(R.string.config_persistentDataPackageName);