Update lint baseline suppression for API 31.

Bug: 171506470
Test: Build
Change-Id: I499737fc74d8ef665fbd63ab3a94d3a25ddcf2fc

2 files changed, 43 insertions, 43 deletions

diff --git a/framework/lint-baseline.xml b/framework/lint-baseline.xml
index f80d811f5b..82439af9eb 100644
--- a/framework/lint-baseline.xml
+++ b/framework/lint-baseline.xml
@@ -102,7 +102,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): CIPHER_GCMP_128 [NewApi]"
+        message="Call requires API level 31 (current min is 30): CIPHER_GCMP_128 [NewApi]"
         errorLine1="        ScanResult.CIPHER_GCMP_128,"
         errorLine2="                   ~~~~~~~~~~~~~~~">
         <location
@@ -112,7 +112,7 @@
     </issue>
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `WIFI_RNR_ENABLED_IF_WIFI_BAND_6_GHZ_SCANNED`"
+        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
@@ -123,7 +123,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): CIPHER_BIP_GMAC_128 [NewApi]"
+        message="Call requires API level 31 (current min is 30): CIPHER_BIP_GMAC_128 [NewApi]"
         errorLine1="        ScanResult.CIPHER_BIP_GMAC_128,"
         errorLine2="                   ~~~~~~~~~~~~~~~">
         <location
@@ -133,7 +133,7 @@
     </issue>
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `WIFI_RNR_ENABLED`"
+        message="Call requires API level 31 (current min is 30): `WIFI_RNR_ENABLED`"
         errorLine1="            WIFI_RNR_ENABLED,"
         errorLine2="            ~~~~~~~~~~~~~~~~">
         <location
@@ -144,7 +144,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): CIPHER_BIP_GMAC_256 [NewApi]"
+        message="Call requires API level 31 (current min is 30): CIPHER_BIP_GMAC_256 [NewApi]"
         errorLine1="        ScanResult.CIPHER_BIP_GMAC_256,"
         errorLine2="                   ~~~~~~~~~~~~~~~">
         <location
@@ -154,7 +154,7 @@
     </issue>
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `WIFI_RNR_NOT_NEEDED`"
+        message="Call requires API level 31 (current min is 30): `WIFI_RNR_NOT_NEEDED`"
         errorLine1="            WIFI_RNR_NOT_NEEDED})"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~">
         <location
@@ -165,7 +165,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): CIPHER_BIP_CMAC_256 [NewApi]"
+        message="Call requires API level 31 (current min is 30): CIPHER_BIP_CMAC_256 [NewApi]"
         errorLine1="        ScanResult.CIPHER_BIP_CMAC_256,"
         errorLine2="                   ~~~~~~~~~~~~~~~">
         <location
@@ -175,7 +175,7 @@
     </issue>
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `WIFI_RNR_ENABLED_IF_WIFI_BAND_6_GHZ_SCANNED`"
+        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
@@ -186,7 +186,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `EASY_CONNECT_EVENT_FAILURE_URI_GENERATION`"
+        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
@@ -197,7 +197,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `EASY_CONNECT_EVENT_FAILURE_ENROLLEE_FAILED_TO_SCAN_NETWORK_CHANNEL`"
+        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
@@ -208,7 +208,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `RECENT_FAILURE_MBO_ASSOC_DISALLOWED_UNSPECIFIED`"
+        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
@@ -219,7 +219,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `RECENT_FAILURE_MBO_ASSOC_DISALLOWED_MAX_NUM_STA_ASSOCIATED`"
+        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
@@ -230,7 +230,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `RECENT_FAILURE_MBO_ASSOC_DISALLOWED_AIR_INTERFACE_OVERLOADED`"
+        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
@@ -241,7 +241,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `RECENT_FAILURE_MBO_ASSOC_DISALLOWED_AUTH_SERVER_OVERLOADED`"
+        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
@@ -252,7 +252,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `RECENT_FAILURE_MBO_ASSOC_DISALLOWED_INSUFFICIENT_RSSI`"
+        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
@@ -263,7 +263,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `RECENT_FAILURE_OCE_RSSI_BASED_ASSOCIATION_REJECTION`"
+        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
@@ -274,7 +274,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `RECENT_FAILURE_NETWORK_NOT_FOUND`"
+        message="Call requires API level 31 (current min is 30): `RECENT_FAILURE_NETWORK_NOT_FOUND`"
         errorLine1="            RECENT_FAILURE_NETWORK_NOT_FOUND"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -285,7 +285,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `EASY_CONNECT_CRYPTOGRAPHY_CURVE_PRIME256V1`"
+        message="Call requires API level 31 (current min is 30): `EASY_CONNECT_CRYPTOGRAPHY_CURVE_PRIME256V1`"
         errorLine1="            EASY_CONNECT_CRYPTOGRAPHY_CURVE_PRIME256V1,"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -296,7 +296,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `EASY_CONNECT_CRYPTOGRAPHY_CURVE_SECP384R1`"
+        message="Call requires API level 31 (current min is 30): `EASY_CONNECT_CRYPTOGRAPHY_CURVE_SECP384R1`"
         errorLine1="            EASY_CONNECT_CRYPTOGRAPHY_CURVE_SECP384R1,"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -307,7 +307,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `EASY_CONNECT_CRYPTOGRAPHY_CURVE_SECP521R1`"
+        message="Call requires API level 31 (current min is 30): `EASY_CONNECT_CRYPTOGRAPHY_CURVE_SECP521R1`"
         errorLine1="            EASY_CONNECT_CRYPTOGRAPHY_CURVE_SECP521R1,"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -318,7 +318,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP256R1`"
+        message="Call requires API level 31 (current min is 30): `EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP256R1`"
         errorLine1="            EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP256R1,"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -329,7 +329,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP384R1`"
+        message="Call requires API level 31 (current min is 30): `EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP384R1`"
         errorLine1="            EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP384R1,"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -340,7 +340,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP512R1`"
+        message="Call requires API level 31 (current min is 30): `EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP512R1`"
         errorLine1="            EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP512R1,"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
diff --git a/service/lint-baseline-pre-jarjar.xml b/service/lint-baseline-pre-jarjar.xml
index d3c5bb24c2..6dc1087a62 100644
--- a/service/lint-baseline-pre-jarjar.xml
+++ b/service/lint-baseline-pre-jarjar.xml
@@ -36,7 +36,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `is6GhzPscOnlyEnabled`"
+        message="Call requires API level 31 (current min is 30): `is6GhzPscOnlyEnabled`"
         errorLine1="                if (SdkLevel.isAtLeastS() &amp;&amp; scanSettings.is6GhzPscOnlyEnabled()"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -102,7 +102,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `CIPHER_GCMP_128`"
+        message="Call requires API level 31 (current min is 30): `CIPHER_GCMP_128`"
         errorLine1="                    return ScanResult.CIPHER_GCMP_128;"
         errorLine2="                                      ~~~~~~~~~~~~~~~">
         <location
@@ -113,7 +113,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `CIPHER_BIP_GMAC_128`"
+        message="Call requires API level 31 (current min is 30): `CIPHER_BIP_GMAC_128`"
         errorLine1="                    return ScanResult.CIPHER_BIP_GMAC_128;"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~">
         <location
@@ -124,7 +124,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `CIPHER_BIP_GMAC_256`"
+        message="Call requires API level 31 (current min is 30): `CIPHER_BIP_GMAC_256`"
         errorLine1="                    return ScanResult.CIPHER_BIP_GMAC_256;"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~">
         <location
@@ -135,7 +135,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `CIPHER_BIP_CMAC_256`"
+        message="Call requires API level 31 (current min is 30): `CIPHER_BIP_CMAC_256`"
         errorLine1="                    return ScanResult.CIPHER_BIP_CMAC_256;"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~">
         <location
@@ -399,7 +399,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `OP_MODE_STA`"
+        message="Call requires API level 31 (current min is 30): `OP_MODE_STA`"
         errorLine1="        if ((mode &amp; WifiAvailableChannel.OP_MODE_STA) != 0) {"
         errorLine2="                                         ~~~~~~~~~~~">
         <location
@@ -410,7 +410,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `OP_MODE_SAP`"
+        message="Call requires API level 31 (current min is 30): `OP_MODE_SAP`"
         errorLine1="        if ((mode &amp; WifiAvailableChannel.OP_MODE_SAP) != 0) {"
         errorLine2="                                         ~~~~~~~~~~~">
         <location
@@ -421,7 +421,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `OP_MODE_WIFI_DIRECT_CLI`"
+        message="Call requires API level 31 (current min is 30): `OP_MODE_WIFI_DIRECT_CLI`"
         errorLine1="        if ((mode &amp; WifiAvailableChannel.OP_MODE_WIFI_DIRECT_CLI) != 0) {"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -432,7 +432,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `OP_MODE_WIFI_DIRECT_GO`"
+        message="Call requires API level 31 (current min is 30): `OP_MODE_WIFI_DIRECT_GO`"
         errorLine1="        if ((mode &amp; WifiAvailableChannel.OP_MODE_WIFI_DIRECT_GO) != 0) {"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -443,7 +443,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `OP_MODE_WIFI_AWARE`"
+        message="Call requires API level 31 (current min is 30): `OP_MODE_WIFI_AWARE`"
         errorLine1="        if ((mode &amp; WifiAvailableChannel.OP_MODE_WIFI_AWARE) != 0) {"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~">
         <location
@@ -454,7 +454,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `OP_MODE_TDLS`"
+        message="Call requires API level 31 (current min is 30): `OP_MODE_TDLS`"
         errorLine1="        if ((mode &amp; WifiAvailableChannel.OP_MODE_TDLS) != 0) {"
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
@@ -465,7 +465,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `OP_MODE_STA`"
+        message="Call requires API level 31 (current min is 30): `OP_MODE_STA`"
         errorLine1="            mode |= WifiAvailableChannel.OP_MODE_STA;"
         errorLine2="                                         ~~~~~~~~~~~">
         <location
@@ -476,7 +476,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `OP_MODE_SAP`"
+        message="Call requires API level 31 (current min is 30): `OP_MODE_SAP`"
         errorLine1="            mode |= WifiAvailableChannel.OP_MODE_SAP;"
         errorLine2="                                         ~~~~~~~~~~~">
         <location
@@ -487,7 +487,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `OP_MODE_WIFI_DIRECT_CLI`"
+        message="Call requires API level 31 (current min is 30): `OP_MODE_WIFI_DIRECT_CLI`"
         errorLine1="            mode |= WifiAvailableChannel.OP_MODE_WIFI_DIRECT_CLI;"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -498,7 +498,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `OP_MODE_WIFI_DIRECT_GO`"
+        message="Call requires API level 31 (current min is 30): `OP_MODE_WIFI_DIRECT_GO`"
         errorLine1="            mode |= WifiAvailableChannel.OP_MODE_WIFI_DIRECT_GO;"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -509,7 +509,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `OP_MODE_WIFI_AWARE`"
+        message="Call requires API level 31 (current min is 30): `OP_MODE_WIFI_AWARE`"
         errorLine1="            mode |= WifiAvailableChannel.OP_MODE_WIFI_AWARE;"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~">
         <location
@@ -520,7 +520,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `OP_MODE_TDLS`"
+        message="Call requires API level 31 (current min is 30): `OP_MODE_TDLS`"
         errorLine1="            mode |= WifiAvailableChannel.OP_MODE_TDLS;"
         errorLine2="                                         ~~~~~~~~~~~~">
         <location
@@ -531,7 +531,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `FILTER_CONCURRENCY`"
+        message="Call requires API level 31 (current min is 30): `FILTER_CONCURRENCY`"
         errorLine1="        if ((filter &amp; WifiAvailableChannel.FILTER_CONCURRENCY) != 0) {"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~">
         <location
@@ -542,7 +542,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `FILTER_CELLULAR_COEXISTENCE`"
+        message="Call requires API level 31 (current min is 30): `FILTER_CELLULAR_COEXISTENCE`"
         errorLine1="        if ((filter &amp; WifiAvailableChannel.FILTER_CELLULAR_COEXISTENCE) != 0) {"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -553,7 +553,7 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 10000 (current min is 30): `WifiAvailableChannel`"
+        message="Call requires API level 31 (current min is 30): `WifiAvailableChannel`"
         errorLine1="                                answer.value.add(new WifiAvailableChannel(ch.channel,"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location