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

Commit b6fb4ebf authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-33470befccb74b399ba8484212c404fd" into sc-v2-dev-plus-aosp

* changes:
  Merge "RESTRICT AUTOMERGE: Fixed permission issue in car shell" into sc-v2-dev am: ae6ee91e
  RESTRICT AUTOMERGE: Fixed permission issue in car shell am: 758a68da
parents c5ac02e5 5a45e8c0
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@
         is ok. -->
         is ok. -->
    <privapp-permissions package="com.android.shell">
    <privapp-permissions package="com.android.shell">
        <permission name="android.permission.INSTALL_PACKAGES" />
        <permission name="android.permission.INSTALL_PACKAGES" />
        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
        <permission name="android.car.permission.CAR_CONTROL_AUDIO_SETTINGS"/>
        <permission name="android.car.permission.CAR_CONTROL_AUDIO_SETTINGS"/>
        <permission name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME"/>
        <permission name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME"/>