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

Merge changes from topic "enable-cdm-profiles"

Browse Source 
* changes:
  Remove CDM Auto permission from Shell's allowlist
  Enable APP_STREAMING and AUTO_PROJECTION CDM profiles
This commit is contained in:
TreeHugger Robot
2021-12-17 00:00:52 +00:00
committed by Android (Google) Code Review
parent 0d631acac1 8dbde9bfb0
commit 6d4c18c003
2 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/etc/privapp-permissions-platform.xml
View File

@@ -427,7 +427,6 @@ applications that come with the platform
<permission name="android.permission.COMPANION_APPROVE_WIFI_CONNECTIONS" />
<permission name="android.permission.MANAGE_COMPANION_DEVICES" />
<permission name="android.permission.REQUEST_COMPANION_PROFILE_APP_STREAMING" />
<permission name="android.permission.REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION" />
<permission name="android.permission.REQUEST_COMPANION_PROFILE_WATCH" />
<permission name="android.permission.REQUEST_COMPANION_SELF_MANAGED" />
<!-- Permission required for testing registering pull atom callbacks. -->

12
services/companion/java/com/android/server/companion/PermissionsUtils.java
View File

@@ -84,18 +84,6 @@ final class PermissionsUtils {
throw new IllegalArgumentException("Unsupported device profile: " + deviceProfile);
}
if (DEVICE_PROFILE_APP_STREAMING.equals(deviceProfile)) {
// TODO: remove, when properly supporting this profile.
throw new UnsupportedOperationException(
"DEVICE_PROFILE_APP_STREAMING is not fully supported yet.");
}
if (DEVICE_PROFILE_AUTOMOTIVE_PROJECTION.equals(deviceProfile)) {
// TODO: remove, when properly supporting this profile.
throw new UnsupportedOperationException(
"DEVICE_PROFILE_AUTOMOTIVE_PROJECTION is not fully supported yet.");
}
final String permission = DEVICE_PROFILE_TO_PERMISSION.get(deviceProfile);
if (context.checkPermission(permission, getCallingPid(), packageUid)
!= PERMISSION_GRANTED) {