commit e44cf60fe57b08ee47440f9e93b3d7efd4ca72f0
author Etienne Ruffieux <eruffieux@google.com> Mon Dec 13 22:42:44 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 13 22:42:44 2021 +0000
tree 20519365ec277470740c2617bbb0e618ee99c601
parent 6a8b9f396480d555dd5470a9025666597b4d6935
parent 6123954747f84c5f1aacf846bd25af65ec2b1425

Merge "Added SystemApi tag to BLUETOOTH_MAP permission."

core/api/system-current.txt

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index cd1fef9..ca3c511 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -66,6 +66,7 @@
     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

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 1a38ea1..fcf830e 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2018,7 +2018,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"