From 7facfb2cd3c0cc734effd695c3cfa4da6ae32f76 Mon Sep 17 00:00:00 2001
From: Etienne Ruffieux <eruffieux@google.com>
Date: Wed, 12 Jan 2022 14:25:12 +0000
Subject: [PATCH] Added SystemApi annotation to permission used in Bluetooth

As the Bluetooth module will be built as an apex, we need
to remove all hidden API usages. BluetoothManagerService
is using MANAGE_BLUETOOTH_WHEN_WIRELESS_CONSENT_REQUIRED
so we need to expose it as SystemAPI

Tag: #feature
Bug: 211851706
Test: make
Change-Id: Ia9da9ddefc7e466f13a969a2877068ef97a032f9
---
 core/api/system-current.txt  | 1 +
 core/res/AndroidManifest.xml | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 069cc5e6580d4..e1f6df108fe66 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -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";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 6ecfcec0e804b..591cf814c2dcb 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -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" />