From ef0765341019ff8af8150b9ced8a924b8aea61aa Mon Sep 17 00:00:00 2001
From: xshu <xshu@google.com>
Date: Wed, 16 Mar 2022 00:19:27 -0700
Subject: [PATCH] Remove MANAGE_WIFI_AUTO_JOIN

This permission is replaced with MANAGE_WIFI_NETWORK_SELECTION.

Bug: 219947411
Test: compile
Change-Id: I433f53bb7bcdd7e2bac4a6c7838bd5ca6cd487ea
---
 core/api/current.txt         | 1 -
 core/res/AndroidManifest.xml | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index b5493a3fa8c75..f21fc6f611652 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -113,7 +113,6 @@ package android {
     field public static final String MANAGE_MEDIA = "android.permission.MANAGE_MEDIA";
     field public static final String MANAGE_ONGOING_CALLS = "android.permission.MANAGE_ONGOING_CALLS";
     field public static final String MANAGE_OWN_CALLS = "android.permission.MANAGE_OWN_CALLS";
-    field @Deprecated public static final String MANAGE_WIFI_AUTO_JOIN = "android.permission.MANAGE_WIFI_AUTO_JOIN";
     field public static final String MANAGE_WIFI_INTERFACES = "android.permission.MANAGE_WIFI_INTERFACES";
     field public static final String MANAGE_WIFI_NETWORK_SELECTION = "android.permission.MANAGE_WIFI_NETWORK_SELECTION";
     field public static final String MASTER_CLEAR = "android.permission.MASTER_CLEAR";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index d652b2ff4f4a8..98f94586819fb 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1898,15 +1898,6 @@
         android:label="@string/permlab_changeWifiState"
         android:protectionLevel="normal" />
 
-    <!-- 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.
-         @deprecated will be replaced with MANAGE_WIFI_NETWORK_SELECTION -->
-    <permission android:name="android.permission.MANAGE_WIFI_AUTO_JOIN"
-                android:protectionLevel="signature|privileged|knownSigner"
-                android:knownCerts="@array/wifi_known_signers" />
-
     <!-- This permission is used to let OEMs grant their trusted app access to a subset of
          privileged wifi APIs to improve wifi performance. Allows applications to manage
          Wi-Fi network selection related features such as enable or disable global auto-join,