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

Commit f57f96ff authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Added SystemApi tag to BLUETOOTH_MAP permission." am: e44cf60f am:... 

Merge "Added SystemApi tag to BLUETOOTH_MAP permission." am: e44cf60f am: 655d7f98 am: 4761d37d am: a4181e3f

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

Change-Id: I1ea41cb2a7758baef1f7860bfa9a86da06e1af51
parents 2954689c a4181e3f

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ package android { 
    field public static final String BIND_TRANSLATION_SERVICE = "android.permission.BIND_TRANSLATION_SERVICE";

    field public static final String BIND_TRUST_AGENT = "android.permission.BIND_TRUST_AGENT";

    field public static final String BIND_TV_REMOTE_SERVICE = "android.permission.BIND_TV_REMOTE_SERVICE";

    field public static final String BLUETOOTH_MAP = "android.permission.BLUETOOTH_MAP";

    field public static final String BRICK = "android.permission.BRICK";

    field public static final String BRIGHTNESS_SLIDER_USAGE = "android.permission.BRIGHTNESS_SLIDER_USAGE";

    field public static final String BROADCAST_CLOSE_SYSTEM_DIALOGS = "android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS";

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2066,7 +2066,7 @@ 
    <permission android:name="android.permission.BLUETOOTH_PRIVILEGED"

        android:protectionLevel="signature|privileged" />



    <!-- Control access to email providers exclusively for Bluetooth

    <!-- @SystemApi Control access to email providers exclusively for Bluetooth

         @hide

    -->

    <permission android:name="android.permission.BLUETOOTH_MAP"