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

Commit 294ab3c4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "ClusterState.displayId" into sc-dev am: 793ae837 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14464335

Change-Id: I3afabac4dc637f260cb2d98a6cf0cee3320b10dc
parents e1bb3ca7 793ae837

data/etc/car/com.android.car.cluster.home.xml

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
<permissions>

    <privapp-permissions package="com.android.car.cluster.home">

        <permission name="android.permission.INTERACT_ACROSS_USERS"/>

        <permission name="android.car.permission.ACCESS_PRIVATE_DISPLAY_ID"/>

        <permission name="android.car.permission.CAR_INSTRUMENT_CLUSTER_CONTROL"/>

    </privapp-permissions>

</permissions>

data/etc/car/com.android.carsystemui.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
        <permission name="android.car.permission.ACCESS_CAR_PROJECTION_STATUS"/>

        <permission name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME"/>

        <permission name="android.car.permission.CAR_ENROLL_TRUST"/>

        <permission name="android.car.permission.CAR_INSTRUMENT_CLUSTER_CONTROL"/>

        <permission name="android.car.permission.CAR_POWER"/>

        <permission name="android.car.permission.CONTROL_CAR_CLIMATE"/>

        <permission name="android.car.permission.CONTROL_CAR_EVS_ACTIVITY"/>