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

Commit a3f857f1 authored by Adam Bookatz's avatar Adam Bookatz Committed by Android (Google) Code Review
Browse files

Merge "Fix VirtualDeviceManagerService startUser crash"

parents ebed2a6d 6821cae1

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

+4 −4
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ import static com.android.internal.util.function.pooled.PooledLambda.obtainRunna 
import static com.android.server.companion.AssociationStore.CHANGE_TYPE_UPDATED_ADDRESS_UNCHANGED;

import static com.android.server.companion.PermissionsUtils.checkCallerCanManageAssociationsForPackage;

import static com.android.server.companion.PermissionsUtils.checkCallerCanManageCompanionDevice;

import static com.android.server.companion.PermissionsUtils.enforceCallerCanInteractWithUserId;

import static com.android.server.companion.PermissionsUtils.enforceCallerCanManageAssociationsForPackage;

import static com.android.server.companion.PermissionsUtils.enforceCallerCanManageCompanionDevice;

import static com.android.server.companion.PermissionsUtils.enforceCallerIsSystemOr;

import static com.android.server.companion.PermissionsUtils.enforceCallerIsSystemOrCanInteractWithUserId;

import static com.android.server.companion.RolesUtils.addRoleHolderForAssociation;

import static com.android.server.companion.RolesUtils.removeRoleHolderForAssociation;
@@ -459,7 +459,7 @@ public class CompanionDeviceManagerService extends SystemService 


        @Override

        public List<AssociationInfo> getAllAssociationsForUser(int userId) throws RemoteException {

            enforceCallerCanInteractWithUserId(getContext(), userId);

            enforceCallerIsSystemOrCanInteractWithUserId(getContext(), userId);

            enforceCallerCanManageCompanionDevice(getContext(), "getAllAssociationsForUser");



            return mAssociationStore.getAssociationsForUser(userId);
@@ -468,7 +468,7 @@ public class CompanionDeviceManagerService extends SystemService 
        @Override

        public void addOnAssociationsChangedListener(IOnAssociationsChangedListener listener,

                int userId) {

            enforceCallerCanInteractWithUserId(getContext(), userId);

            enforceCallerIsSystemOrCanInteractWithUserId(getContext(), userId);

            enforceCallerCanManageCompanionDevice(getContext(),

                    "addOnAssociationsChangedListener");
@@ -478,7 +478,7 @@ public class CompanionDeviceManagerService extends SystemService 
        @Override

        public void removeOnAssociationsChangedListener(IOnAssociationsChangedListener listener,

                int userId) {

            enforceCallerCanInteractWithUserId(getContext(), userId);

            enforceCallerIsSystemOrCanInteractWithUserId(getContext(), userId);

            enforceCallerCanManageCompanionDevice(

                    getContext(), "removeOnAssociationsChangedListener");

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

+6 −0
Original line number Diff line number Diff line
@@ -114,6 +114,12 @@ final class PermissionsUtils { 
        context.enforceCallingPermission(INTERACT_ACROSS_USERS, null);

    }



    static void enforceCallerIsSystemOrCanInteractWithUserId(@NonNull Context context, int userId) {

        if (getCallingUid() == SYSTEM_UID) return;



        enforceCallerCanInteractWithUserId(context, userId);

    }



    static boolean checkCallerIsSystemOr(@UserIdInt int userId, @NonNull String packageName) {

        final int callingUid = getCallingUid();

        if (callingUid == SYSTEM_UID) return true;