Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d4c18c0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "enable-cdm-profiles" 

* changes:
  Remove CDM Auto permission from Shell's allowlist
  Enable APP_STREAMING and AUTO_PROJECTION CDM profiles
parents 0d631aca 8dbde9bf

data/etc/privapp-permissions-platform.xml

+0 −1
Original line number Diff line number Diff line
@@ -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. -->

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

+0 −12
Original line number Diff line number Diff line
@@ -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) {