From 7ac1d74d87893993c500da323afb92e2aba98110 Mon Sep 17 00:00:00 2001
From: xshu <xshu@google.com>
Date: Fri, 20 Aug 2021 17:56:56 -0700
Subject: [PATCH] Add permission MANAGE_WIFI_AUTOJOIN

Add a new permission for privileged apps to enable/disable wifi auto
join.

Bug: 189406335
Bug: 187703075
Test: compile
Change-Id: Icb02944961e386dece8f976d8865af7dd11a0f27
---
 core/api/system-current.txt  | 1 +
 core/res/AndroidManifest.xml | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index a25c3d5facb0a..8fb526dfc1dfb 100755
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -165,6 +165,7 @@ package android {
     field public static final String MANAGE_USB = "android.permission.MANAGE_USB";
     field public static final String MANAGE_USERS = "android.permission.MANAGE_USERS";
     field public static final String MANAGE_USER_OEM_UNLOCK_STATE = "android.permission.MANAGE_USER_OEM_UNLOCK_STATE";
+    field public static final String MANAGE_WIFI_AUTO_JOIN = "android.permission.MANAGE_WIFI_AUTO_JOIN";
     field public static final String MANAGE_WIFI_COUNTRY_CODE = "android.permission.MANAGE_WIFI_COUNTRY_CODE";
     field public static final String MODIFY_APPWIDGET_BIND_PERMISSIONS = "android.permission.MODIFY_APPWIDGET_BIND_PERMISSIONS";
     field public static final String MODIFY_AUDIO_ROUTING = "android.permission.MODIFY_AUDIO_ROUTING";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index b3a16d97b27b9..14d2c1f3c8b3b 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1788,6 +1788,13 @@
         android:label="@string/permlab_changeWifiState"
         android:protectionLevel="normal" />
 
+    <!-- @SystemApi @hide Allows applications to enable/disable wifi auto join. This permission
+         is used to let OEMs grant their trusted app access to a subset of privileged wifi APIs
+         to improve wifi performance.
+         <p>Not for use by third-party applications. -->
+    <permission android:name="android.permission.MANAGE_WIFI_AUTO_JOIN"
+                android:protectionLevel="signature|privileged" />
+
     <!-- @SystemApi @hide Allows apps to create and manage IPsec tunnels.
          <p>Only granted to applications that are currently bound by the
          system for creating and managing IPsec-based interfaces.