commit d10becf63ab5eb0439f66a3ba5ab8edf7684bdc0
author Pete Bentley <prb@google.com> Thu Oct 21 20:53:16 2021 +0100
committer Pete Bentley <prb@google.com> Thu Oct 28 14:51:27 2021 +0100
tree 67eb4b67d545c234c772d4e86b425f79c1dc070a
parent 5e43a09387f1a67bc36351bde56204c4479708f3

OpenJDK 11: Merge java.security.cert.URICertStoreParameters.

Needed for doc references from LDAPCertStoreParameters.
NB we should consider dropping both of these.

Bug: 203769066
Test: m droid hidden-docs
Test: atest CtsLibcoreOjTestCases:test.java.security.cert.URICertStoreParameters.TestBasic
Change-Id: I1e940d442c5b30f1d3f7f1fb8b7a75abdf335734

lint-baseline.xml

diff --git a/lint-baseline.xml b/lint-baseline.xml
index 0b45784..f8159e0 100644
--- a/lint-baseline.xml
+++ b/lint-baseline.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <issues format="6" by="lint 7.1.0-dev" type="baseline" client="" dependencies="true" name="" variant="all" version="7.1.0-dev">
+
     <issue
         id="NewApi"
         message="Class requires API level 32 (current min is 31): `java.lang.invoke.VarHandle`"
@@ -7,7 +8,7 @@
         errorLine2="                                          ~~~~~~~~~">
         <location
             file="libcore/libart/src/main/java/java/lang/invoke/ArrayElementVarHandle.java"
-            line="27"
+            line="26"
             column="43"/>
     </issue>
 
@@ -51,7 +52,7 @@
         errorLine2="                               ~~~~~~~~~">
         <location
             file="libcore/ojluni/src/main/java/java/lang/invoke/MethodHandles.java"
-            line="900"
+            line="901"
             column="32"/>
     </issue>
 
@@ -62,7 +63,7 @@
         errorLine2="                        ~~~~~~~~~">
         <location
             file="libcore/ojluni/src/main/java/java/lang/invoke/MethodHandles.java"
-            line="2470"
+            line="2471"
             column="25"/>
     </issue>
 
@@ -73,8 +74,30 @@
         errorLine2="                                                             ~~~~~~~~~">
         <location
             file="libcore/ojluni/src/main/java/java/lang/invoke/MethodHandles.java"
-            line="2477"
+            line="2478"
             column="62"/>
     </issue>
 
+    <issue
+        id="NewApi"
+        message="Class requires API level 32 (current min is 31): `java.security.cert.URICertStoreParameters`"
+        errorLine1="        if (p == null || (!(p instanceof URICertStoreParameters))) {"
+        errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="libcore/ojluni/src/main/java/java/security/cert/URICertStoreParameters.java"
+            line="127"
+            column="42"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Class requires API level 32 (current min is 31): `java.security.cert.URICertStoreParameters`"
+        errorLine1="        URICertStoreParameters other = (URICertStoreParameters)p;"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="libcore/ojluni/src/main/java/java/security/cert/URICertStoreParameters.java"
+            line="135"
+            column="41"/>
+    </issue>
+
 </issues>