From 9c83a2b64a1861718375b071e713f3c72adbff2d Mon Sep 17 00:00:00 2001
From: Quang Luong <qal@google.com>
Date: Wed, 24 Feb 2021 18:05:29 -0800
Subject: [PATCH] Add permission role SYSTEM_WIFI_COEX_MANAGER

Add permission role SYSTEM_WIFI_COEX_MANAGER for system apps that need
to manage the state of the wifi framework coex module.

Bug: 174575969
Test: build
Change-Id: I6e97b2cabf4219c455f346df37008092a9f85590
---
 core/api/system-current.txt    | 1 +
 core/res/AndroidManifest.xml   | 6 +++---
 core/res/res/values/config.xml | 2 ++
 core/res/res/values/public.xml | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index c3d5d5a4eda72..adb783d7662be 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -356,6 +356,7 @@ package android {
     field public static final int config_systemGallery = 17039399; // 0x1040027
     field public static final int config_systemShell = 17039402; // 0x104002a
     field public static final int config_systemSpeechRecognizer = 17039406; // 0x104002e
+    field public static final int config_systemWifiCoexManager = 17039407; // 0x104002f
   }
 
   public static final class R.style {
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index d5f5d28aa7a26..0046be08d7828 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1876,15 +1876,15 @@
     <permission android:name="android.permission.WIFI_UPDATE_USABILITY_STATS_SCORE"
         android:protectionLevel="signature|privileged" />
 
-    <!-- @SystemApi @hide Allows system APK to update Wifi/Cellular coex channels to avoid.
+    <!-- @SystemApi @hide Allows applications to update Wifi/Cellular coex channels to avoid.
              <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.WIFI_UPDATE_COEX_UNSAFE_CHANNELS"
-        android:protectionLevel="signature" />
+        android:protectionLevel="signature|role" />
 
     <!-- @SystemApi @hide Allows applications to access Wifi/Cellular coex channels being avoided.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.WIFI_ACCESS_COEX_UNSAFE_CHANNELS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|role" />
 
     <!-- @SystemApi @hide Allows an application to manage an automotive device's application network
          preference as it relates to OEM_PAID and OEM_PRIVATE capable networks.
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 12cb3980f785c..78ddc30a65983 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1955,6 +1955,8 @@
     <string name="config_systemContacts" translatable="false">com.android.contacts</string>
     <!-- The name of the package that will hold the speech recognizer role by default. -->
     <string name="config_systemSpeechRecognizer" translatable="false"></string>
+    <!-- The name of the package that will hold the system Wi-Fi coex manager role. -->
+    <string name="config_systemWifiCoexManager" translateable="false"></string>
 
     <!-- The name of the package that will be allowed to change its components' label/icon. -->
     <string name="config_overrideComponentUiPackage" translatable="false"></string>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 2004d0a8d15c8..9bc92e14de531 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -3168,6 +3168,8 @@
     <public name="config_customMediaSessionPolicyProvider" />
     <!-- @hide @SystemApi -->
     <public name="config_systemSpeechRecognizer" />
+    <!-- @hide @SystemApi -->
+    <public name="config_systemWifiCoexManager" />
   </public-group>
 
   <public-group type="id" first-id="0x01020055">