diff options
| author | Etienne Ruffieux <eruffieux@google.com> | 2021-12-13 23:03:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-13 23:03:44 +0000 |
| commit | 655d7f9857ba4a0ecde897aa7c64190ab000abfc (patch) | |
| tree | 5b76157d1a3ee80df20394b6711b5c506e085e45 | |
| parent | f9ed5725daa6544c6e397885b2edd8696a7446e3 (diff) | |
| parent | e44cf60fe57b08ee47440f9e93b3d7efd4ca72f0 (diff) | |
| download | base-temp_sam_210511427.tar.gz | |
Merge "Added SystemApi tag to BLUETOOTH_MAP permission." am: e44cf60fe5temp_sam_210511427
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1918634
Change-Id: Ibcfed4617dcaea3b81e5d3a3eb68e6494488c7f7
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index cd1fef9d18ba..ca3c51152514 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -66,6 +66,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"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 39403d7fb58c..6ecfcec0e804 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2019,7 +2019,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" |