Clean up lint errors

Remove the annotation on constant. And enable strict_updatability_linting for Framework-Wifi

Bug: 188851704
Test: build

Change-Id: Ib74ad34ecd5b160b22c9b1b785db7842a80eedfb

8 files changed, 35 insertions, 487 deletions

diff --git a/framework/Android.bp b/framework/Android.bp
index 1b44362712..5ca6c1a47c 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -147,6 +147,9 @@ java_sdk_library {
         // Created by jarjar rules.
         "com.android.wifi.x",
     ],
+    lint: {
+        strict_updatability_linting: true,
+    },
 }
 
 // defaults for tests that need to build against framework-wifi's @hide APIs
diff --git a/framework/java/android/net/wifi/EasyConnectStatusCallback.java b/framework/java/android/net/wifi/EasyConnectStatusCallback.java
index 6c243bab21..729dbfceec 100644
--- a/framework/java/android/net/wifi/EasyConnectStatusCallback.java
+++ b/framework/java/android/net/wifi/EasyConnectStatusCallback.java
@@ -168,7 +168,6 @@ public abstract class EasyConnectStatusCallback {
     /**
      * Easy Connect Failure event: System failed to generate DPP URI.
      */
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int EASY_CONNECT_EVENT_FAILURE_URI_GENERATION = -13;
 
     /**
@@ -177,7 +176,6 @@ public abstract class EasyConnectStatusCallback {
      * is not included in the list of channels the Enrollee scanned in attempting to
      * discover the network prior to connection.
      */
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int EASY_CONNECT_EVENT_FAILURE_ENROLLEE_FAILED_TO_SCAN_NETWORK_CHANNEL =
             -14;
 
diff --git a/framework/java/android/net/wifi/ScanResult.java b/framework/java/android/net/wifi/ScanResult.java
index 5e4765cc09..efdf09b65d 100644
--- a/framework/java/android/net/wifi/ScanResult.java
+++ b/framework/java/android/net/wifi/ScanResult.java
@@ -27,8 +27,6 @@ import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import androidx.annotation.RequiresApi;
-
 import com.android.modules.utils.build.SdkLevel;
 
 import java.lang.annotation.Retention;
@@ -276,28 +274,24 @@ public final class ScanResult implements Parcelable {
      * Cipher suite: GCMP_128
      */
     @SystemApi
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int CIPHER_GCMP_128 = 6;
     /**
      * @hide
      * Cipher suite: BIP_GMAC_128
      */
     @SystemApi
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int CIPHER_BIP_GMAC_128 = 7;
     /**
      * @hide
      * Cipher suite: BIP_GMAC_256
      */
     @SystemApi
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int CIPHER_BIP_GMAC_256 = 8;
     /**
      * @hide
      * Cipher suite: BIP_CMAC_256
      */
     @SystemApi
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int CIPHER_BIP_CMAC_256 = 9;
 
     /**
diff --git a/framework/java/android/net/wifi/WifiConfiguration.java b/framework/java/android/net/wifi/WifiConfiguration.java
index 569a802816..924cd33450 100644
--- a/framework/java/android/net/wifi/WifiConfiguration.java
+++ b/framework/java/android/net/wifi/WifiConfiguration.java
@@ -42,8 +42,6 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
 
-import androidx.annotation.RequiresApi;
-
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.modules.utils.build.SdkLevel;
 import com.android.net.module.util.MacAddressUtils;
@@ -2738,7 +2736,6 @@ public class WifiConfiguration implements Parcelable {
      * @hide
      */
     @SystemApi
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int RECENT_FAILURE_MBO_ASSOC_DISALLOWED_UNSPECIFIED = 1005;
 
     /**
@@ -2748,7 +2745,6 @@ public class WifiConfiguration implements Parcelable {
      * @hide
      */
     @SystemApi
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int RECENT_FAILURE_MBO_ASSOC_DISALLOWED_MAX_NUM_STA_ASSOCIATED = 1006;
 
     /**
@@ -2758,7 +2754,6 @@ public class WifiConfiguration implements Parcelable {
      * @hide
      */
     @SystemApi
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int RECENT_FAILURE_MBO_ASSOC_DISALLOWED_AIR_INTERFACE_OVERLOADED = 1007;
 
     /**
@@ -2768,7 +2763,6 @@ public class WifiConfiguration implements Parcelable {
      * @hide
      */
     @SystemApi
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int RECENT_FAILURE_MBO_ASSOC_DISALLOWED_AUTH_SERVER_OVERLOADED = 1008;
 
     /**
@@ -2778,7 +2772,6 @@ public class WifiConfiguration implements Parcelable {
      * @hide
      */
     @SystemApi
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int RECENT_FAILURE_MBO_ASSOC_DISALLOWED_INSUFFICIENT_RSSI = 1009;
 
     /**
@@ -2788,7 +2781,6 @@ public class WifiConfiguration implements Parcelable {
      * @hide
      */
     @SystemApi
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int RECENT_FAILURE_OCE_RSSI_BASED_ASSOCIATION_REJECTION = 1010;
 
     /**
@@ -2797,7 +2789,6 @@ public class WifiConfiguration implements Parcelable {
      * @hide
      */
     @SystemApi
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int RECENT_FAILURE_NETWORK_NOT_FOUND = 1011;
 
     /**
diff --git a/framework/java/android/net/wifi/WifiManager.java b/framework/java/android/net/wifi/WifiManager.java
index fc100cd20e..45ce7cf78e 100644
--- a/framework/java/android/net/wifi/WifiManager.java
+++ b/framework/java/android/net/wifi/WifiManager.java
@@ -6672,7 +6672,6 @@ public class WifiManager {
      * @hide
      */
     @SystemApi
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int EASY_CONNECT_CRYPTOGRAPHY_CURVE_PRIME256V1 = 0;
 
     /**
@@ -6681,7 +6680,6 @@ public class WifiManager {
      * @hide
      */
     @SystemApi
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int EASY_CONNECT_CRYPTOGRAPHY_CURVE_SECP384R1 = 1;
 
     /**
@@ -6690,7 +6688,6 @@ public class WifiManager {
      * @hide
      */
     @SystemApi
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int EASY_CONNECT_CRYPTOGRAPHY_CURVE_SECP521R1 = 2;
 
 
@@ -6700,7 +6697,6 @@ public class WifiManager {
      * @hide
      */
     @SystemApi
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP256R1 = 3;
 
 
@@ -6710,7 +6706,6 @@ public class WifiManager {
      * @hide
      */
     @SystemApi
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP384R1 = 4;
 
 
@@ -6720,7 +6715,6 @@ public class WifiManager {
      * @hide
      */
     @SystemApi
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP512R1 = 5;
 
     /** @hide */
diff --git a/framework/java/android/net/wifi/WifiScanner.java b/framework/java/android/net/wifi/WifiScanner.java
index 2fe9d021e2..22d12c0bd6 100644
--- a/framework/java/android/net/wifi/WifiScanner.java
+++ b/framework/java/android/net/wifi/WifiScanner.java
@@ -189,14 +189,12 @@ public class WifiScanner {
      * <li> {@link #WIFI_BAND_24_5_WITH_DFS_6_60_GHZ} </li>
      * <li> {@link #WIFI_BAND_ALL} </li>
      **/
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int WIFI_RNR_ENABLED_IF_WIFI_BAND_6_GHZ_SCANNED = 0;
     /**
      * This constant is used for {@link ScanSettings#setRnrSetting(int)}.
      * <p>
      * Request to scan 6Ghz APs co-located with 2.4/5Ghz APs using Reduced Neighbor Report (RNR).
      **/
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int WIFI_RNR_ENABLED = 1;
     /**
      * This constant is used for {@link ScanSettings#setRnrSetting(int)}.
@@ -204,7 +202,6 @@ public class WifiScanner {
      * Do not request to scan 6Ghz APs co-located with 2.4/5Ghz APs using
      * Reduced Neighbor Report (RNR)
      **/
-    @RequiresApi(Build.VERSION_CODES.S)
     public static final int WIFI_RNR_NOT_NEEDED = 2;
 
     /** @hide */
diff --git a/framework/lint-baseline.xml b/framework/lint-baseline.xml
deleted file mode 100644
index f94a4fc3cc..0000000000
--- a/framework/lint-baseline.xml
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `new android.net.wifi.aware.AwareResources`"
-        errorLine1="                    return new AwareResources(in.readInt(), in.readInt(), in.readInt());"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/aware/AwareResources.java"
-            line="148"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Field requires API level 31 (current min is 30): `android.net.wifi.ScanResult.InformationElement#CREATOR`"
-        errorLine1="                sr.informationElements = in.createTypedArray(InformationElement.CREATOR);"
-        errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java"
-            line="1324"
-            column="62"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Field requires API level 31 (current min is 30): `android.net.wifi.WifiManager.AddNetworkResult#statusCode`"
-        errorLine1="            dest.writeInt(statusCode);"
-        errorLine2="                          ~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java"
-            line="1805"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Field requires API level 31 (current min is 30): `android.net.wifi.WifiManager.AddNetworkResult#networkId`"
-        errorLine1="            dest.writeInt(networkId);"
-        errorLine2="                          ~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java"
-            line="1806"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `new android.net.wifi.WifiManager.AddNetworkResult`"
-        errorLine1="                        return new AddNetworkResult(in.readInt(), in.readInt());"
-        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java"
-            line="1813"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Field requires API level 31 (current min is 30): `android.net.wifi.WifiManager.AddNetworkResult#statusCode`"
-        errorLine1="            this.statusCode = statusCode;"
-        errorLine2="            ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java"
-            line="1833"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Field requires API level 31 (current min is 30): `android.net.wifi.WifiManager.AddNetworkResult#networkId`"
-        errorLine1="            this.networkId = networkId;"
-        errorLine2="            ~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java"
-            line="1834"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Method reference requires API level 31 (current min is 30): `callback::onSubsystemRestarting`"
-        errorLine1="                executor.execute(callback::onSubsystemRestarting);"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java"
-            line="3547"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Method reference requires API level 31 (current min is 30): `callback::onSubsystemRestarted`"
-        errorLine1="                executor.execute(callback::onSubsystemRestarted);"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java"
-            line="3562"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `CIPHER_GCMP_128`"
-        errorLine1="        ScanResult.CIPHER_GCMP_128,"
-        errorLine2="                   ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiAnnotations.java"
-            line="126"
-            column="20"/>
-    </issue>
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `WIFI_RNR_ENABLED_IF_WIFI_BAND_6_GHZ_SCANNED`"
-        errorLine1="            WIFI_RNR_ENABLED_IF_WIFI_BAND_6_GHZ_SCANNED,"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiScanner.java"
-            line="213"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `CIPHER_BIP_GMAC_128`"
-        errorLine1="        ScanResult.CIPHER_BIP_GMAC_128,"
-        errorLine2="                   ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiAnnotations.java"
-            line="127"
-            column="20"/>
-    </issue>
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `WIFI_RNR_ENABLED`"
-        errorLine1="            WIFI_RNR_ENABLED,"
-        errorLine2="            ~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiScanner.java"
-            line="214"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `CIPHER_BIP_GMAC_256`"
-        errorLine1="        ScanResult.CIPHER_BIP_GMAC_256,"
-        errorLine2="                   ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiAnnotations.java"
-            line="128"
-            column="20"/>
-    </issue>
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `WIFI_RNR_NOT_NEEDED`"
-        errorLine1="            WIFI_RNR_NOT_NEEDED})"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiScanner.java"
-            line="215"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `CIPHER_BIP_CMAC_256`"
-        errorLine1="        ScanResult.CIPHER_BIP_CMAC_256,"
-        errorLine2="                   ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiAnnotations.java"
-            line="129"
-            column="20"/>
-    </issue>
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `WIFI_RNR_ENABLED_IF_WIFI_BAND_6_GHZ_SCANNED`"
-        errorLine1="        private int mRnrSetting = WIFI_RNR_ENABLED_IF_WIFI_BAND_6_GHZ_SCANNED;"
-        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiScanner.java"
-            line="364"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `EASY_CONNECT_EVENT_FAILURE_URI_GENERATION`"
-        errorLine1="            EASY_CONNECT_EVENT_FAILURE_URI_GENERATION,"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/EasyConnectStatusCallback.java"
-            line="198"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `EASY_CONNECT_EVENT_FAILURE_ENROLLEE_FAILED_TO_SCAN_NETWORK_CHANNEL`"
-        errorLine1="            EASY_CONNECT_EVENT_FAILURE_ENROLLEE_FAILED_TO_SCAN_NETWORK_CHANNEL,"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/EasyConnectStatusCallback.java"
-            line="199"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `RECENT_FAILURE_MBO_ASSOC_DISALLOWED_UNSPECIFIED`"
-        errorLine1="            RECENT_FAILURE_MBO_ASSOC_DISALLOWED_UNSPECIFIED,"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java"
-            line="2685"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `RECENT_FAILURE_MBO_ASSOC_DISALLOWED_MAX_NUM_STA_ASSOCIATED`"
-        errorLine1="            RECENT_FAILURE_MBO_ASSOC_DISALLOWED_MAX_NUM_STA_ASSOCIATED,"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java"
-            line="2686"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `RECENT_FAILURE_MBO_ASSOC_DISALLOWED_AIR_INTERFACE_OVERLOADED`"
-        errorLine1="            RECENT_FAILURE_MBO_ASSOC_DISALLOWED_AIR_INTERFACE_OVERLOADED,"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java"
-            line="2687"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `RECENT_FAILURE_MBO_ASSOC_DISALLOWED_AUTH_SERVER_OVERLOADED`"
-        errorLine1="            RECENT_FAILURE_MBO_ASSOC_DISALLOWED_AUTH_SERVER_OVERLOADED,"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java"
-            line="2688"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `RECENT_FAILURE_MBO_ASSOC_DISALLOWED_INSUFFICIENT_RSSI`"
-        errorLine1="            RECENT_FAILURE_MBO_ASSOC_DISALLOWED_INSUFFICIENT_RSSI,"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java"
-            line="2689"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `RECENT_FAILURE_OCE_RSSI_BASED_ASSOCIATION_REJECTION`"
-        errorLine1="            RECENT_FAILURE_OCE_RSSI_BASED_ASSOCIATION_REJECTION,"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java"
-            line="2690"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `RECENT_FAILURE_NETWORK_NOT_FOUND`"
-        errorLine1="            RECENT_FAILURE_NETWORK_NOT_FOUND"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java"
-            line="2691"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `EASY_CONNECT_CRYPTOGRAPHY_CURVE_PRIME256V1`"
-        errorLine1="            EASY_CONNECT_CRYPTOGRAPHY_CURVE_PRIME256V1,"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java"
-            line="6708"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `EASY_CONNECT_CRYPTOGRAPHY_CURVE_SECP384R1`"
-        errorLine1="            EASY_CONNECT_CRYPTOGRAPHY_CURVE_SECP384R1,"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java"
-            line="6709"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `EASY_CONNECT_CRYPTOGRAPHY_CURVE_SECP521R1`"
-        errorLine1="            EASY_CONNECT_CRYPTOGRAPHY_CURVE_SECP521R1,"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java"
-            line="6710"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP256R1`"
-        errorLine1="            EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP256R1,"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java"
-            line="6711"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP384R1`"
-        errorLine1="            EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP384R1,"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java"
-            line="6712"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP512R1`"
-        errorLine1="            EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP512R1,"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java"
-            line="6713"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Field requires API level 31 (current min is 30): `android.net.wifi.ScanResult.InformationElement#CREATOR`"
-        errorLine1="                        ScanResult.InformationElement.CREATOR);"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java"
-            line="1333"
-            column="25"/>
-    </issue>
-
-</issues>
diff --git a/service/lint-baseline-pre-jarjar.xml b/service/lint-baseline-pre-jarjar.xml
index 5b4405fc23..a41eded162 100644
--- a/service/lint-baseline-pre-jarjar.xml
+++ b/service/lint-baseline-pre-jarjar.xml
@@ -8,7 +8,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/util/ApConfigUtil.java"
-            line="130"
+            line="134"
             column="27"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/util/ApConfigUtil.java"
-            line="369"
+            line="373"
             column="47"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/util/ApConfigUtil.java"
-            line="569"
+            line="573"
             column="32"/>
     </issue>
 
@@ -102,56 +102,12 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 31 (current min is 30): `CIPHER_GCMP_128`"
-        errorLine1="                    return ScanResult.CIPHER_GCMP_128;"
-        errorLine2="                                      ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/util/InformationElementUtil.java"
-            line="1107"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `CIPHER_BIP_GMAC_128`"
-        errorLine1="                    return ScanResult.CIPHER_BIP_GMAC_128;"
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/util/InformationElementUtil.java"
-            line="1109"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `CIPHER_BIP_GMAC_256`"
-        errorLine1="                    return ScanResult.CIPHER_BIP_GMAC_256;"
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/util/InformationElementUtil.java"
-            line="1111"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `CIPHER_BIP_CMAC_256`"
-        errorLine1="                    return ScanResult.CIPHER_BIP_CMAC_256;"
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/util/InformationElementUtil.java"
-            line="1113"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="NewApi"
         message="Call requires API level 31 (current min is 30): `android.net.wifi.WifiEnterpriseConfig#isEapMethodServerCertUsed`"
         errorLine1="        if (config.isEnterprise() &amp;&amp; config.enterpriseConfig.isEapMethodServerCertUsed()"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/NetworkSuggestionNominator.java"
-            line="253"
+            line="266"
             column="62"/>
     </issue>
 
@@ -261,7 +217,7 @@
         errorLine2="                                                                      ~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiDiagnostics.java"
-            line="367"
+            line="369"
             column="71"/>
     </issue>
 
@@ -272,7 +228,7 @@
         errorLine2="                ~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiNetworkFactory.java"
-            line="675"
+            line="676"
             column="17"/>
     </issue>
 
@@ -283,7 +239,7 @@
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiNetworkSuggestionsManager.java"
-            line="1085"
+            line="1089"
             column="42"/>
     </issue>
 
@@ -294,7 +250,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiServiceImpl.java"
-            line="2704"
+            line="2715"
             column="16"/>
     </issue>
 
@@ -305,7 +261,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiServiceImpl.java"
-            line="2711"
+            line="2722"
             column="20"/>
     </issue>
 
@@ -316,7 +272,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiServiceImpl.java"
-            line="2723"
+            line="2734"
             column="24"/>
     </issue>
 
@@ -327,7 +283,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiServiceImpl.java"
-            line="2740"
+            line="2751"
             column="24"/>
     </issue>
 
@@ -338,7 +294,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiServiceImpl.java"
-            line="2744"
+            line="2755"
             column="20"/>
     </issue>
 
@@ -349,7 +305,7 @@
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiServiceImpl.java"
-            line="2747"
+            line="2758"
             column="62"/>
     </issue>
 
@@ -360,7 +316,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiServiceImpl.java"
-            line="2754"
+            line="2765"
             column="24"/>
     </issue>
 
@@ -371,7 +327,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiServiceImpl.java"
-            line="2771"
+            line="2782"
             column="20"/>
     </issue>
 
@@ -382,7 +338,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiServiceImpl.java"
-            line="2773"
+            line="2784"
             column="16"/>
     </issue>
 
@@ -393,7 +349,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiShellCommand.java"
-            line="393"
+            line="398"
             column="52"/>
     </issue>
 
@@ -404,7 +360,7 @@
         errorLine2="                                         ~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiVendorHal.java"
-            line="3767"
+            line="3800"
             column="42"/>
     </issue>
 
@@ -415,7 +371,7 @@
         errorLine2="                                         ~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiVendorHal.java"
-            line="3770"
+            line="3803"
             column="42"/>
     </issue>
 
@@ -426,7 +382,7 @@
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiVendorHal.java"
-            line="3773"
+            line="3806"
             column="42"/>
     </issue>
 
@@ -437,7 +393,7 @@
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiVendorHal.java"
-            line="3776"
+            line="3809"
             column="42"/>
     </issue>
 
@@ -448,7 +404,7 @@
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiVendorHal.java"
-            line="3779"
+            line="3812"
             column="42"/>
     </issue>
 
@@ -459,7 +415,7 @@
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiVendorHal.java"
-            line="3782"
+            line="3815"
             column="42"/>
     </issue>
 
@@ -470,7 +426,7 @@
         errorLine2="                                         ~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiVendorHal.java"
-            line="3794"
+            line="3827"
             column="42"/>
     </issue>
 
@@ -481,7 +437,7 @@
         errorLine2="                                         ~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiVendorHal.java"
-            line="3797"
+            line="3830"
             column="42"/>
     </issue>
 
@@ -492,7 +448,7 @@
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiVendorHal.java"
-            line="3800"
+            line="3833"
             column="42"/>
     </issue>
 
@@ -503,7 +459,7 @@
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiVendorHal.java"
-            line="3803"
+            line="3836"
             column="42"/>
     </issue>
 
@@ -514,7 +470,7 @@
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiVendorHal.java"
-            line="3806"
+            line="3839"
             column="42"/>
     </issue>
 
@@ -525,7 +481,7 @@
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiVendorHal.java"
-            line="3809"
+            line="3842"
             column="42"/>
     </issue>
 
@@ -536,7 +492,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiVendorHal.java"
-            line="3820"
+            line="3853"
             column="44"/>
     </issue>
 
@@ -547,7 +503,7 @@
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiVendorHal.java"
-            line="3823"
+            line="3856"
             column="44"/>
     </issue>
 
@@ -558,30 +514,8 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiVendorHal.java"
-            line="3850"
+            line="3883"
             column="50"/>
     </issue>
 
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `EASY_CONNECT_EVENT_FAILURE_URI_GENERATION`"
-        errorLine1="                case EASY_CONNECT_EVENT_FAILURE_URI_GENERATION:"
-        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/DppMetrics.java"
-            line="249"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `EASY_CONNECT_EVENT_FAILURE_ENROLLEE_FAILED_TO_SCAN_NETWORK_CHANNEL`"
-        errorLine1="                case EASY_CONNECT_EVENT_FAILURE_ENROLLEE_FAILED_TO_SCAN_NETWORK_CHANNEL:"
-        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/DppMetrics.java"
-            line="255"
-            column="22"/>
-    </issue>
-
 </issues>