Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Added SystemApi annotation to permission used in Bluetooth" am: 74c56a05b2 am: 57178ffd0b

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

Change-Id: I30fbc92e785497d8789927c20aca92d3aaa0794d
This commit is contained in:
Etienne Ruffieux
2022-01-13 09:45:57 +00:00
committed by Automerger Merge Worker
parent 2115ddbcdf 57178ffd0b
commit baaf6e6053
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -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";

5
core/res/AndroidManifest.xml
View File

@@ -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" />