Merge "Don't require MANAGE_ROLE_HOLDERS when removing CDM associatons" (9b59c503) · Commits · e / os / android_frameworks_base

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

+19 −14

Original line number	Diff line number	Diff line
		@@ -612,6 +612,8 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
		+ " for " + association
		+ " - profile still present in " + otherAssociationWithDeviceProfile);
		} else {
		long identity = Binder.clearCallingIdentity();
		try {
		mRoleManager.removeRoleHolderAsUser(
		association.getDeviceProfile(),
		association.getPackageName(),
		@@ -626,6 +628,9 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
		+ " for user " + association.getUserId());
		}
		});
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		}
		}
		}