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

Merge "Remove role checker for non-selfManaged association" into tm-dev

Browse Source
This commit is contained in:
Evan Chen
2022-05-14 06:06:55 +00:00
committed by Android (Google) Code Review
parent f505fefdd6 f9dded9434
commit 5f7154db85
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java
View File

@@ -182,7 +182,7 @@ class AssociationRequestsProcessor {
// 2b.1. Populate the request with required info. // 2b.1. Populate the request with required info.
request.setPackageName(packageName); request.setPackageName(packageName);
request.setUserId(userId); request.setUserId(userId);
request.setSkipPrompt(mayAssociateWithoutPrompt(request, packageName, userId)); request.setSkipPrompt(mayAssociateWithoutPrompt(packageName, userId));
// 2b.2. Prepare extras and create an Intent. // 2b.2. Prepare extras and create an Intent.
final Bundle extras = new Bundle(); final Bundle extras = new Bundle();
@@ -321,18 +321,7 @@ class AssociationRequestsProcessor {
} }
}; };
private boolean mayAssociateWithoutPrompt(@NonNull AssociationRequest request, private boolean mayAssociateWithoutPrompt(@NonNull String packageName, @UserIdInt int userId) {
@NonNull String packageName, @UserIdInt int userId) {
final String deviceProfile = request.getDeviceProfile();
if (deviceProfile != null) {
final boolean isRoleHolder = Binder.withCleanCallingIdentity(
() -> isRoleHolder(mContext, userId, packageName, deviceProfile));
if (isRoleHolder) {
// Don't need to collect user's consent since app already holds the role.
return true;
}
}
// Below we check if the requesting package is allowlisted (usually by the OEM) for creating // Below we check if the requesting package is allowlisted (usually by the OEM) for creating
// CDM associations without user confirmation (prompt). // CDM associations without user confirmation (prompt).
// For this we'll check to config arrays: // For this we'll check to config arrays: