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

Commit ea1c3734 authored by Evan Chen's avatar Evan Chen Committed by Android (Google) Code Review
Browse files

Merge "Make sure to disassociate all the packages with shared UID" into tm-qpr-dev

parents 34d37a95 4c1c3768

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+17 −11
Original line number Original line Diff line number Diff line
@@ -153,6 +153,7 @@ public class CompanionDeviceManagerService extends SystemService { 
    private final IAppOpsService mAppOpsManager;

    private final IAppOpsService mAppOpsManager;

    private final PowerWhitelistManager mPowerWhitelistManager;

    private final PowerWhitelistManager mPowerWhitelistManager;

    private final UserManager mUserManager;

    private final UserManager mUserManager;

    private final PackageManager mPackageManager;

    final PackageManagerInternal mPackageManagerInternal;

    final PackageManagerInternal mPackageManagerInternal;





    /**

    /**
@@ -204,6 +205,7 @@ public class CompanionDeviceManagerService extends SystemService { 
        mAtmInternal = LocalServices.getService(ActivityTaskManagerInternal.class);

        mAtmInternal = LocalServices.getService(ActivityTaskManagerInternal.class);

        mAmInternal = LocalServices.getService(ActivityManagerInternal.class);

        mAmInternal = LocalServices.getService(ActivityManagerInternal.class);

        mPackageManagerInternal = LocalServices.getService(PackageManagerInternal.class);

        mPackageManagerInternal = LocalServices.getService(PackageManagerInternal.class);

        mPackageManager = context.getPackageManager();

        mUserManager = context.getSystemService(UserManager.class);

        mUserManager = context.getSystemService(UserManager.class);





        mUserPersistenceHandler = new PersistUserStateHandler();

        mUserPersistenceHandler = new PersistUserStateHandler();
@@ -1431,8 +1433,10 @@ public class CompanionDeviceManagerService extends SystemService { 
                return;

                return;

            }

            }





            final String packageName = getPackageNameByUid(uid);

            // A UID can be shared by multiple packages if android:sharedUserId is used.

            if (packageName == null) {

            // We must get all packages for the UID to ensure we find the correct one.

            final String[] packageNames = mPackageManager.getPackagesForUid(uid);

            if (packageNames == null || packageNames.length == 0) {

                // Not interested in this uid.

                // Not interested in this uid.

                return;

                return;

            }

            }
@@ -1441,6 +1445,7 @@ public class CompanionDeviceManagerService extends SystemService { 




            boolean needToPersistStateForUser = false;

            boolean needToPersistStateForUser = false;





            for (String packageName : packageNames) {

                for (AssociationInfo association :

                for (AssociationInfo association :

                        getPendingRoleHolderRemovalAssociationsForUser(userId)) {

                        getPendingRoleHolderRemovalAssociationsForUser(userId)) {

                    if (!packageName.equals(association.getPackageName())) continue;

                    if (!packageName.equals(association.getPackageName())) continue;
@@ -1453,6 +1458,7 @@ public class CompanionDeviceManagerService extends SystemService { 
                    removeFromPendingRoleHolderRemoval(association);

                    removeFromPendingRoleHolderRemoval(association);

                    needToPersistStateForUser = true;

                    needToPersistStateForUser = true;

                }

                }

            }





            if (needToPersistStateForUser) {

            if (needToPersistStateForUser) {

                mUserPersistenceHandler.postPersistUserState(userId);

                mUserPersistenceHandler.postPersistUserState(userId);