Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't require MANAGE_ROLE_HOLDERS when removing CDM associatons" into udc-dev

Browse Source
This commit is contained in:
Evan Chen
2023-02-17 21:23:38 +00:00
committed by Android (Google) Code Review
parent 74efadf738 7d27732fef
commit c01e1ce412
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/companion/java/com/android/server/companion/RolesUtils.java
View File

@@ -27,6 +27,7 @@ import android.annotation.UserIdInt;
import android.app.role.RoleManager; import android.app.role.RoleManager;
import android.companion.AssociationInfo; import android.companion.AssociationInfo;
import android.content.Context; import android.content.Context;
import android.os.Binder;
import android.os.UserHandle; import android.os.UserHandle;
import android.util.Log; import android.util.Log;
import android.util.Slog; import android.util.Slog;
@@ -84,6 +85,8 @@ final class RolesUtils {
Slog.i(TAG, "Removing CDM role holder, role=" + deviceProfile Slog.i(TAG, "Removing CDM role holder, role=" + deviceProfile
+ ", package=u" + userId + "\\" + packageName); + ", package=u" + userId + "\\" + packageName);
final long identity = Binder.clearCallingIdentity();
try {
roleManager.removeRoleHolderAsUser(deviceProfile, packageName, roleManager.removeRoleHolderAsUser(deviceProfile, packageName,
MANAGE_HOLDERS_FLAG_DONT_KILL_APP, userHandle, context.getMainExecutor(), MANAGE_HOLDERS_FLAG_DONT_KILL_APP, userHandle, context.getMainExecutor(),
success -> { success -> {
@@ -92,6 +95,9 @@ final class RolesUtils {
+ " from the list of " + deviceProfile + " holders."); + " from the list of " + deviceProfile + " holders.");
} }
}); });
} finally {
Binder.restoreCallingIdentity(identity);
}
} }
private RolesUtils() {}; private RolesUtils() {};