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

Commit 2c303ea7 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:... 

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

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

Change-Id: I8ddcd56162138d729abb9d3d4e0b77729ce8a8b4
parents 2410c71d f1654085

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,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
@@ -2182,8 +2182,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" />