summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Cole Faust <colefaust@google.com> 2024-02-08 22:08:26 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-02-08 22:08:26 +0000
commitdb07d40fa58233a359448e157408a8e17fd8768c (patch)
treee0ab4b51e00b6a103eb3a59aaadd41502dee4d6f
parentf1bfd66cb669a4e58e81eb524b4dcbeb3a1c2e18 (diff)
parent44b555bdb11f4ac0f932554ce4fdc7520d5c9dca (diff)
Merge changes from topic "am-7a0590ba838143efb4414d055ed84814" into main
* changes: Merge changes from topic "prepare_for_requiresapi_class_retention" into main am: bfb1d27a8d am: 9360033f84 Remove strict_updatability_linting: true am: 327ce20e91 am: b8bddb14bd Baseline NewApi issues am: e2e993bfe1 am: ce5c515177
-rw-r--r--service/lint-baseline.xml32
1 files changed, 27 insertions, 5 deletions
diff --git a/service/lint-baseline.xml b/service/lint-baseline.xml
index dc5dd8f885..a07581f619 100644
--- a/service/lint-baseline.xml
+++ b/service/lint-baseline.xml
@@ -102,12 +102,34 @@
<issue
id="NewApi"
+ message="Call requires API level 35 (current min is 30): `getVendorData`"
+ errorLine1=" if (!config.getVendorData().isEmpty()) {"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/Wifi/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHalAidlImpl.java"
+ line="589"
+ column="25"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level 35 (current min is 30): `getVendorData`"
+ errorLine1=" HalAidlUtil.frameworkToHalOuiKeyedDataList(config.getVendorData());"
+ errorLine2=" ~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/Wifi/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHalAidlImpl.java"
+ line="591"
+ column="75"/>
+ </issue>
+
+ <issue
+ id="NewApi"
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/WifiShellCommand.java"
- line="2333"
+ line="2359"
column="35"/>
</issue>
@@ -118,7 +140,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiShellCommand.java"
- line="2335"
+ line="2361"
column="35"/>
</issue>
@@ -129,7 +151,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiShellCommand.java"
- line="2337"
+ line="2363"
column="35"/>
</issue>
@@ -140,7 +162,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiShellCommand.java"
- line="2339"
+ line="2365"
column="35"/>
</issue>
@@ -151,7 +173,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Wifi/service/java/com/android/server/wifi/WifiShellCommand.java"
- line="2341"
+ line="2367"
column="35"/>
</issue>