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

Commit cbdf88ce authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge changes from topic "nearby-bluetooth-permission-group" into sc-dev am: 9f5392e8 

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

Change-Id: Idef7bb2a70ff9a5f0c4eff73ccbdc6e2bae02259
parents ca917b0d 9f5392e8

core/tests/bluetoothtests/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 


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

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

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

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

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

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

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

core/tests/coretests/AndroidManifest.xml

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

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

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

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

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

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

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

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

core/tests/hosttests/test-apps/ExternalLocAllPermsTestApp/AndroidManifest.xml

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

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

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

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

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

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

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

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

core/tests/hosttests/test-apps/ExternalSharedPermsBT/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 
       android:sharedUserId="com.android.framework.externalsharedpermstestapp">



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

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

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

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



    <application>

        <uses-library android:name="android.test.runner" />

media/packages/BluetoothMidiService/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ 
    <uses-feature android:name="android.software.midi"

         android:required="true"/>

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

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

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

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



    <application

        tools:replace="android:label"