Baseline NewApi issues

NewApi is a lint check that you don't call framework methods that were
introduced in versions later than your min_sdk_version. We want to
make this an error, so we're baselineing all existing issues.

This cl was generated automatically, by taking all the NewApi issues
from the reference baselines, and all the non-NewApi issues from the
existing checked in baselines.

Bug: 268261262
Test: Presubmits
Change-Id: I13a11c9a77fac0bbabc87b1a0377c761b8d96907

4 files changed, 56 insertions, 288 deletions

diff --git a/framework/Android.bp b/framework/Android.bp
index c05ff69eb8..df2d2d2c6c 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -94,9 +94,6 @@ java_library {
         "com.android.wifi",
         "test_com.android.wifi",
     ],
-    lint: {
-        baseline_filename: "lint-baseline.xml",
-    },
 }
 
 // defaults shared between `framework-wifi` & `framework-wifi-pre-jarjar`
@@ -149,9 +146,6 @@ java_library {
         "//packages/modules/Wifi/service",
         "//packages/modules/Wifi/service/tests/wifitests",
     ],
-    lint: {
-        baseline_filename: "lint-baseline.xml",
-    },
 }
 
 // post-jarjar version of framework-wifi
@@ -216,7 +210,7 @@ java_sdk_library {
     ],
     lint: {
         strict_updatability_linting: true,
-        baseline_filename: "lint-baseline.xml",
+
     },
 }
 
diff --git a/framework/lint-baseline.xml b/framework/lint-baseline.xml
deleted file mode 100644
index 848c74ab67..0000000000
--- a/framework/lint-baseline.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.0.0-dev" type="baseline" dependencies="true" variant="all" version="8.0.0-dev">
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.compat.Compatibility#isChangeEnabled`"
-        errorLine1="            if (!Compatibility.isChangeEnabled("
-        errorLine2="                               ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/SoftApConfiguration.java"
-            line="1351"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.compat.Compatibility#isChangeEnabled`"
-        errorLine1="            if (Compatibility.isChangeEnabled("
-        errorLine2="                              ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/SoftApConfiguration.java"
-            line="1830"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.compat.Compatibility#isChangeEnabled`"
-        errorLine1="        if (!Compatibility.isChangeEnabled("
-        errorLine2="                           ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/framework/java/android/net/wifi/SoftApConfiguration.java"
-            line="904"
-            column="28"/>
-    </issue>
-
-</issues>
\ No newline at end of file
diff --git a/service/Android.bp b/service/Android.bp
index 22662f4c36..1b869bcb53 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -48,6 +48,7 @@ java_library {
     lint: {
         strict_updatability_linting: true,
         baseline_filename: "lint-baseline.xml",
+
     },
     libs: [
         "androidx.annotation_annotation",
@@ -160,9 +161,6 @@ java_library {
         "com.android.wifi",
         "test_com.android.wifi",
     ],
-    lint: {
-        baseline_filename: "lint-baseline.xml",
-    },
 }
 
 // Statsd auto-generated code
diff --git a/service/lint-baseline.xml b/service/lint-baseline.xml
index 3c73a30e70..dc5dd8f885 100644
--- a/service/lint-baseline.xml
+++ b/service/lint-baseline.xml
@@ -1,126 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.0.0-dev" type="baseline" dependencies="true" variant="all" version="8.0.0-dev">
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.compat.Compatibility#isChangeEnabled`"
-        errorLine1="                                        &amp;&amp; Compatibility.isChangeEnabled("
-        errorLine2="                                                         ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/util/XmlUtil.java"
-            line="2213"
-            column="58"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.compat.Compatibility#isChangeEnabled`"
-        errorLine1="            if (Compatibility.isChangeEnabled("
-        errorLine2="                              ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiApConfigStore.java"
-            line="307"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.compat.Compatibility#isChangeEnabled`"
-        errorLine1="        if (Compatibility.isChangeEnabled(SoftApConfiguration.REMOVE_ZERO_FOR_TIMEOUT_SETTING)"
-        errorLine2="                          ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/SoftApManager.java"
-            line="316"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.net.TrafficStats#getRxBytes`"
-        errorLine1="        return TrafficStats.getRxBytes(iface);"
-        errorLine2="                            ~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/FrameworkFacade.java"
-            line="246"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.net.TrafficStats#getTxBytes`"
-        errorLine1="        return TrafficStats.getTxBytes(iface);"
-        errorLine2="                            ~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/FrameworkFacade.java"
-            line="242"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.net.vcn.VcnManager#addVcnNetworkPolicyChangeListener`"
-        errorLine1="            mVcnManager.addVcnNetworkPolicyChangeListener(new HandlerExecutor(getHandler()),"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/ClientModeImpl.java"
-            line="3916"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.net.vcn.VcnManager#applyVcnNetworkPolicy`"
-        errorLine1="                mVcnManager.applyVcnNetworkPolicy(networkCapabilities, mLinkProperties);"
-        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/ClientModeImpl.java"
-            line="4931"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.net.vcn.VcnManager#removeVcnNetworkPolicyChangeListener`"
-        errorLine1="            mVcnManager.removeVcnNetworkPolicyChangeListener(mVcnPolicyChangeListener);"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/ClientModeImpl.java"
-            line="1753"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.net.vcn.VcnNetworkPolicyResult#getNetworkCapabilities`"
-        errorLine1="        final NetworkCapabilities vcnCapability = vcnNetworkPolicy.getNetworkCapabilities();"
-        errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/ClientModeImpl.java"
-            line="4935"
-            column="68"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.net.vcn.VcnNetworkPolicyResult#isTeardownRequested`"
-        errorLine1="        if (vcnNetworkPolicy.isTeardownRequested()) {"
-        errorLine2="                             ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/ClientModeImpl.java"
-            line="4932"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.security.KeyChain#getWifiKeyGrantAsUser`"
-        errorLine1="        return KeyChain.getWifiKeyGrantAsUser(context, user, alias);"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/FrameworkFacade.java"
-            line="392"
-            column="25"/>
-    </issue>
+<issues format="6" by="lint 8.4.0-alpha01" type="baseline" client="" dependencies="true" name="" variant="all" version="8.4.0-alpha01">
 
     <issue
         id="NewApi"
@@ -129,150 +8,84 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/FrameworkFacade.java"
-            line="385"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.app.admin.SecurityLog#writeEvent`"
-        errorLine1="            SecurityLog.writeEvent(SecurityLog.TAG_WIFI_CONNECTION, redactedBssid,"
-        errorLine2="                        ~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/ClientModeImpl.java"
-            line="967"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.app.admin.SecurityLog#writeEvent`"
-        errorLine1="            SecurityLog.writeEvent(SecurityLog.TAG_WIFI_DISCONNECTION, redactedBssid, reasonString);"
-        errorLine2="                        ~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/ClientModeImpl.java"
-            line="965"
+            line="386"
             column="25"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.os.ServiceManager#waitForDeclaredService`"
-        errorLine1="                        ServiceManager.waitForDeclaredService(HAL_INSTANCE_NAME));"
-        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/SupplicantStaIfaceHalAidlImpl.java"
-            line="526"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.os.ServiceManager#waitForDeclaredService`"
-        errorLine1="                        ServiceManager.waitForDeclaredService(HAL_INSTANCE_NAME));"
-        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHalAidlImpl.java"
-            line="313"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.os.ServiceManager#waitForDeclaredService`"
-        errorLine1="                    ServiceManager.waitForDeclaredService(HAL_INSTANCE_NAME));"
-        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/HostapdHalAidlImp.java"
-            line="479"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.os.ServiceManager#waitForDeclaredService`"
-        errorLine1="                    ServiceManager.waitForDeclaredService(HAL_INSTANCE_NAME));"
-        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `android.os.Trace#traceBegin`"
+        errorLine1="            Trace.traceBegin(Trace.TRACE_TAG_NETWORK, signature);"
+        errorLine2="                  ~~~~~~~~~~">
         <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/hal/WifiHalAidlImpl.java"
-            line="369"
-            column="36"/>
+            file="packages/modules/Wifi/service/java/com/android/server/wifi/RunnerHandler.java"
+            line="116"
+            column="19"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.os.Trace#traceBegin`"
-        errorLine1="            Trace.traceBegin(Trace.TRACE_TAG_NETWORK, signature);"
-        errorLine2="                  ~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `android.os.Trace#traceEnd`"
+        errorLine1="            Trace.traceEnd(Trace.TRACE_TAG_NETWORK);"
+        errorLine2="                  ~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/RunnerHandler.java"
-            line="112"
+            line="124"
             column="19"/>
     </issue>
 
     <issue
         id="NewApi"
         message="Call requires API level 33 (current min is 30): `android.os.Trace#traceBegin`"
-        errorLine1="        Trace.traceBegin(Trace.TRACE_TAG_NETWORK, getMessageLogRec(STATE_ENTER_CMD));"
+        errorLine1="        Trace.traceBegin(Trace.TRACE_TAG_NETWORK, signatureToLog);"
         errorLine2="              ~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/RunnerState.java"
-            line="74"
+            line="66"
             column="15"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.os.Trace#traceBegin`"
-        errorLine1="        Trace.traceBegin(Trace.TRACE_TAG_NETWORK, getMessageLogRec(STATE_EXIT_CMD));"
-        errorLine2="              ~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `android.os.Trace#traceEnd`"
+        errorLine1="        Trace.traceEnd(Trace.TRACE_TAG_NETWORK);"
+        errorLine2="              ~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/RunnerState.java"
-            line="87"
+            line="68"
             column="15"/>
     </issue>
 
     <issue
         id="NewApi"
         message="Call requires API level 33 (current min is 30): `android.os.Trace#traceBegin`"
-        errorLine1="        Trace.traceBegin(Trace.TRACE_TAG_NETWORK, getMessageLogRec(message.what));"
+        errorLine1="        Trace.traceBegin(Trace.TRACE_TAG_NETWORK, signatureToLog);"
         errorLine2="              ~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/RunnerState.java"
-            line="61"
+            line="83"
             column="15"/>
     </issue>
 
     <issue
         id="NewApi"
         message="Call requires API level 33 (current min is 30): `android.os.Trace#traceEnd`"
-        errorLine1="            Trace.traceEnd(Trace.TRACE_TAG_NETWORK);"
-        errorLine2="                  ~~~~~~~~">
-        <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/RunnerHandler.java"
-            line="120"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.os.Trace#traceEnd`"
         errorLine1="        Trace.traceEnd(Trace.TRACE_TAG_NETWORK);"
         errorLine2="              ~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/RunnerState.java"
-            line="63"
+            line="85"
             column="15"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.os.Trace#traceEnd`"
-        errorLine1="        Trace.traceEnd(Trace.TRACE_TAG_NETWORK);"
-        errorLine2="              ~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `android.os.Trace#traceBegin`"
+        errorLine1="        Trace.traceBegin(Trace.TRACE_TAG_NETWORK, signatureToLog);"
+        errorLine2="              ~~~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/RunnerState.java"
-            line="76"
+            line="99"
             column="15"/>
     </issue>
 
@@ -283,63 +96,63 @@
         errorLine2="              ~~~~~~~~">
         <location
             file="packages/modules/Wifi/service/java/com/android/server/wifi/RunnerState.java"
-            line="89"
+            line="101"
             column="15"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 34 (current min is 30): `android.net.wifi.WifiKeystore#get`"
-        errorLine1="            byte[] blob = WifiKeystore.get(alias);"
-        errorLine2="                                       ~~~">
+        message="Call requires API level 33 (current min is 30): `setMaxChannelBandwidth`"
+        errorLine1="                    configBuilder.setMaxChannelBandwidth(SoftApInfo.CHANNEL_WIDTH_20MHZ);"
+        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/SupplicantStaIfaceHalAidlImpl.java"
-            line="3746"
-            column="40"/>
+            file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiShellCommand.java"
+            line="2333"
+            column="35"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 34 (current min is 30): `android.net.wifi.WifiKeystore#list`"
-        errorLine1="            return WifiKeystore.list(prefix);"
-        errorLine2="                                ~~~~">
+        message="Call requires API level 33 (current min is 30): `setMaxChannelBandwidth`"
+        errorLine1="                    configBuilder.setMaxChannelBandwidth(SoftApInfo.CHANNEL_WIDTH_40MHZ);"
+        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/SupplicantStaIfaceHalAidlImpl.java"
-            line="3758"
-            column="33"/>
+            file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiShellCommand.java"
+            line="2335"
+            column="35"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 34 (current min is 30): `new android.net.wifi.nl80211.WifiNl80211Manager`"
-        errorLine1="        mMockWifiNl80211Manager = new WifiNl80211Manager(mContext, wificondBinder);"
+        message="Call requires API level 33 (current min is 30): `setMaxChannelBandwidth`"
+        errorLine1="                    configBuilder.setMaxChannelBandwidth(SoftApInfo.CHANNEL_WIDTH_80MHZ);"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/mockwifi/MockWifiNl80211Manager.java"
-            line="45"
+            file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiShellCommand.java"
+            line="2337"
             column="35"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Class requires API level 31 (current min is 30): `android.net.vcn.VcnManager.VcnNetworkPolicyChangeListener`"
-        errorLine1="            implements VcnManager.VcnNetworkPolicyChangeListener {"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `setMaxChannelBandwidth`"
+        errorLine1="                    configBuilder.setMaxChannelBandwidth(SoftApInfo.CHANNEL_WIDTH_160MHZ);"
+        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/ClientModeImpl.java"
-            line="7986"
-            column="24"/>
+            file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiShellCommand.java"
+            line="2339"
+            column="35"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Class requires API level 31 (current min is 30): `android.net.wifi.nl80211.WifiNl80211Manager.CountryCodeChangedListener`"
-        errorLine1="            WifiNl80211Manager.CountryCodeChangedListener {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `setMaxChannelBandwidth`"
+        errorLine1="                    configBuilder.setMaxChannelBandwidth(SoftApInfo.CHANNEL_WIDTH_320MHZ);"
+        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiNative.java"
-            line="200"
-            column="13"/>
+            file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiShellCommand.java"
+            line="2341"
+            column="35"/>
     </issue>
 
 </issues>
\ No newline at end of file