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

Commit 384882aa authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "Shell: Grant BLUETOOTH_PRIVILEGED permission to Shell" am: 69e56099 am: eada5871 

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

Change-Id: I82645039ddaa7514992d3967b9a64efc77444896
parents d4d21706 eada5871

data/etc/privapp-permissions-platform.xml

+2 −0
Original line number Diff line number Diff line
@@ -292,6 +292,8 @@ applications that come with the platform 
        <!-- Needed for test only -->

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

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

        <!-- BLUETOOTH_PRIVILEGED is needed for test only -->

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

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

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

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

packages/Shell/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -121,6 +121,8 @@ 
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

    <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE"/>

    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />

    <!-- BLUETOOTH_PRIVILEGED is needed for testing purposes only. -->

    <uses-permission android:name="android.permission.BLUETOOTH_PRIVILEGED" />

    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />

    <uses-permission android:name="android.permission.LOCAL_MAC_ADDRESS" />

    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />