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

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

Merge "Added SystemApi annotation to permission used in Bluetooth" am: 74c56a05 am: 57178ffd 

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

Change-Id: I30fbc92e785497d8789927c20aca92d3aaa0794d
parents 2115ddbc 57178ffd

core/api/system-current.txt

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

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

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

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

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

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

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

core/res/AndroidManifest.xml

+3 −2
Original line number Diff line number Diff line
@@ -2114,8 +2114,9 @@ 
    <permission android:name="android.permission.NFC_HANDOVER_STATUS"

        android:protectionLevel="signature|privileged" />



    <!-- @hide Allows internal management of Bluetooth state when on wireless consent mode.

         <p>Not for use by third-party applications. -->

    <!-- @SystemApi Allows internal management of Bluetooth state when on wireless consent mode.

         <p>Not for use by third-party applications.

         @hide -->

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

        android:protectionLevel="signature" />