diff options
| author | 2022-05-14 06:38:02 +0000 | |
|---|---|---|
| committer | 2022-05-14 06:38:02 +0000 | |
| commit | 6c9bb47b5965e710ce9437b65c027730eed697ae (patch) | |
| tree | 15c4ba650003179d16a5a460c8c19e98be21f2ce | |
| parent | 6bdd8fcf86544458a40a3d9208a72d051d4ae5cd (diff) | |
| parent | 5f7154db85bfa13586ed8d3cc690b92cda79a042 (diff) | |
Merge "Remove role checker for non-selfManaged association" into tm-dev am: 5f7154db85
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18384203
Change-Id: I131a58308cb80ecc83a4679cde817482ae3a78d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java b/services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java index 7a5fa628f645..570e4e6fdc3d 100644 --- a/services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java +++ b/services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java @@ -182,7 +182,7 @@ class AssociationRequestsProcessor { // 2b.1. Populate the request with required info. request.setPackageName(packageName); request.setUserId(userId); - request.setSkipPrompt(mayAssociateWithoutPrompt(request, packageName, userId)); + request.setSkipPrompt(mayAssociateWithoutPrompt(packageName, userId)); // 2b.2. Prepare extras and create an Intent. final Bundle extras = new Bundle(); @@ -321,18 +321,7 @@ class AssociationRequestsProcessor { } }; - private boolean mayAssociateWithoutPrompt(@NonNull AssociationRequest request, - @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; - } - } - + private boolean mayAssociateWithoutPrompt(@NonNull String packageName, @UserIdInt int userId) { // Below we check if the requesting package is allowlisted (usually by the OEM) for creating // CDM associations without user confirmation (prompt). // For this we'll check to config arrays: |