Update signature files to the new format
The new format is described in tools/metalava/FORMAT.md.
Change-Id: I79898ea1e33d7b5f3c6e3bb64129267ed3b1e62f
Fixes: 116589402 Switch signature files over to the v2 format
Fixes: 112626813 Drop "synchronized" modifier from the signature format
Fixes: 122358225 Omit overriding methods that only differ in final [...]
Fixes: 73088715 API Review: Need doclava to output nullability
Fixes: 79739773 API Review: Metalava enforcing constants are constant
Exempt-From-Owner-Approval: Large-scale tooling change
Test: make sdk, make update-api, make checkapi
Merged-In: Icec2cb426929bfd8d694bb58b20dd37f56fda5fe
diff --git a/xsd/compatibilityMatrix/api/current.txt b/xsd/compatibilityMatrix/api/current.txt
index 0b683f6..3db4d27 100644
--- a/xsd/compatibilityMatrix/api/current.txt
+++ b/xsd/compatibilityMatrix/api/current.txt
@@ -1,9 +1,10 @@
+// Signature format: 2.0
package compatibility.matrix {
public class Avb {
ctor public Avb();
- method public java.lang.String getVbmetaversion();
- method public void setVbmetaversion(java.lang.String);
+ method public String getVbmetaversion();
+ method public void setVbmetaversion(String);
}
public class Compatibilitymatrix {
@@ -11,66 +12,66 @@
method public compatibility.matrix.Avb getAvb();
method public java.util.List<compatibility.matrix.Hal> getHal();
method public java.util.List<compatibility.matrix.Kernel> getKernel();
- method public java.lang.String getLevel();
+ method public String getLevel();
method public compatibility.matrix.Sepolicy getSepolicy();
method public compatibility.matrix.Systemsdk getSystemsdk();
- method public java.lang.String getType();
+ method public String getType();
method public compatibility.matrix.Vendorndk getVendorndk();
- method public java.lang.String getVersion();
+ method public String getVersion();
method public compatibility.matrix.Vndk getVndk();
method public java.util.List<compatibility.matrix.Xmlfile> getXmlfile();
method public void setAvb(compatibility.matrix.Avb);
- method public void setLevel(java.lang.String);
+ method public void setLevel(String);
method public void setSepolicy(compatibility.matrix.Sepolicy);
method public void setSystemsdk(compatibility.matrix.Systemsdk);
- method public void setType(java.lang.String);
+ method public void setType(String);
method public void setVendorndk(compatibility.matrix.Vendorndk);
- method public void setVersion(java.lang.String);
+ method public void setVersion(String);
method public void setVndk(compatibility.matrix.Vndk);
}
public class Config {
ctor public Config();
- method public java.lang.String getKey();
+ method public String getKey();
method public compatibility.matrix.Config.Value getValue();
- method public void setKey(java.lang.String);
+ method public void setKey(String);
method public void setValue(compatibility.matrix.Config.Value);
}
public static class Config.Value {
ctor public Config.Value();
- method public java.lang.String getType();
- method public void setType(java.lang.String);
+ method public String getType();
+ method public void setType(String);
}
public class Hal {
ctor public Hal();
- method public java.lang.String getFormat();
+ method public String getFormat();
method public java.util.List<java.lang.String> getFqname();
- method public java.lang.String getName();
- method public java.lang.String getOptional();
+ method public String getName();
+ method public String getOptional();
method public java.util.List<java.lang.String> getVersion();
method public java.util.List<compatibility.matrix.Interface> get_interface();
- method public void setFormat(java.lang.String);
- method public void setName(java.lang.String);
- method public void setOptional(java.lang.String);
+ method public void setFormat(String);
+ method public void setName(String);
+ method public void setOptional(String);
}
public class Interface {
ctor public Interface();
method public java.util.List<java.lang.String> getInstance();
- method public java.lang.String getName();
+ method public String getName();
method public java.util.List<java.lang.String> getRegexinstance();
- method public void setName(java.lang.String);
+ method public void setName(String);
}
public class Kernel {
ctor public Kernel();
method public compatibility.matrix.Kernel.Conditions getConditions();
method public java.util.List<compatibility.matrix.Config> getConfig();
- method public java.lang.String getVersion();
+ method public String getVersion();
method public void setConditions(compatibility.matrix.Kernel.Conditions);
- method public void setVersion(java.lang.String);
+ method public void setVersion(String);
}
public static class Kernel.Conditions {
@@ -80,9 +81,9 @@
public class Sepolicy {
ctor public Sepolicy();
- method public java.lang.String getKernelsepolicyversion();
+ method public String getKernelsepolicyversion();
method public java.util.List<java.lang.String> getSepolicyversion();
- method public void setKernelsepolicyversion(java.lang.String);
+ method public void setKernelsepolicyversion(String);
}
public class Systemsdk {
@@ -93,36 +94,36 @@
public class Vendorndk {
ctor public Vendorndk();
method public java.util.List<java.lang.String> getLibrary();
- method public java.lang.String getVersion();
- method public void setVersion(java.lang.String);
+ method public String getVersion();
+ method public void setVersion(String);
}
public class Vndk {
ctor public Vndk();
method public java.util.List<java.lang.String> getLibrary();
- method public java.lang.String getVersion();
- method public void setVersion(java.lang.String);
+ method public String getVersion();
+ method public void setVersion(String);
}
public class XmlParser {
ctor public XmlParser();
method public static compatibility.matrix.Compatibilitymatrix read(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
- method public static java.lang.String readText(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public static String readText(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
method public static void skip(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
}
public class Xmlfile {
ctor public Xmlfile();
- method public java.lang.String getFormat();
- method public java.lang.String getName();
- method public java.lang.String getOptional();
- method public java.lang.String getPath();
- method public java.lang.String getVersion();
- method public void setFormat(java.lang.String);
- method public void setName(java.lang.String);
- method public void setOptional(java.lang.String);
- method public void setPath(java.lang.String);
- method public void setVersion(java.lang.String);
+ method public String getFormat();
+ method public String getName();
+ method public String getOptional();
+ method public String getPath();
+ method public String getVersion();
+ method public void setFormat(String);
+ method public void setName(String);
+ method public void setOptional(String);
+ method public void setPath(String);
+ method public void setVersion(String);
}
}
diff --git a/xsd/compatibilityMatrix/api/removed.txt b/xsd/compatibilityMatrix/api/removed.txt
index e69de29..d802177 100644
--- a/xsd/compatibilityMatrix/api/removed.txt
+++ b/xsd/compatibilityMatrix/api/removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/xsd/halManifest/api/current.txt b/xsd/halManifest/api/current.txt
index 615257f..938324c 100644
--- a/xsd/halManifest/api/current.txt
+++ b/xsd/halManifest/api/current.txt
@@ -1,24 +1,25 @@
+// Signature format: 2.0
package hal.manifest {
public class Hal {
ctor public Hal();
- method public java.lang.String getFormat();
+ method public String getFormat();
method public java.util.List<java.lang.String> getFqname();
- method public java.lang.String getName();
- method public java.lang.String getOptional();
+ method public String getName();
+ method public String getOptional();
method public java.util.List<java.lang.String> getVersion();
method public java.util.List<hal.manifest.Interface> get_interface();
- method public void setFormat(java.lang.String);
- method public void setName(java.lang.String);
- method public void setOptional(java.lang.String);
+ method public void setFormat(String);
+ method public void setName(String);
+ method public void setOptional(String);
}
public class Interface {
ctor public Interface();
method public java.util.List<java.lang.String> getInstance();
- method public java.lang.String getName();
+ method public String getName();
method public java.util.List<java.lang.String> getRegexinstance();
- method public void setName(java.lang.String);
+ method public void setName(String);
}
public class Manifest {
@@ -26,23 +27,23 @@
method public java.util.List<hal.manifest.Hal> getHal();
method public hal.manifest.Sepolicy getSepolicy();
method public hal.manifest.Systemsdk getSystemsdk();
- method public java.lang.String getTargetlevel();
- method public java.lang.String getType();
+ method public String getTargetlevel();
+ method public String getType();
method public java.util.List<hal.manifest.Vendorndk> getVendorndk();
- method public java.lang.String getVersion();
+ method public String getVersion();
method public java.util.List<hal.manifest.Vndk> getVndk();
method public void setSepolicy(hal.manifest.Sepolicy);
method public void setSystemsdk(hal.manifest.Systemsdk);
- method public void setTargetlevel(java.lang.String);
- method public void setType(java.lang.String);
- method public void setVersion(java.lang.String);
+ method public void setTargetlevel(String);
+ method public void setType(String);
+ method public void setVersion(String);
}
public class Sepolicy {
ctor public Sepolicy();
- method public java.lang.String getKernelsepolicyversion();
+ method public String getKernelsepolicyversion();
method public java.util.List<java.lang.String> getSepolicyversion();
- method public void setKernelsepolicyversion(java.lang.String);
+ method public void setKernelsepolicyversion(String);
}
public class Systemsdk {
@@ -53,21 +54,21 @@
public class Vendorndk {
ctor public Vendorndk();
method public java.util.List<java.lang.String> getLibrary();
- method public java.lang.String getVersion();
- method public void setVersion(java.lang.String);
+ method public String getVersion();
+ method public void setVersion(String);
}
public class Vndk {
ctor public Vndk();
method public java.util.List<java.lang.String> getLibrary();
- method public java.lang.String getVersion();
- method public void setVersion(java.lang.String);
+ method public String getVersion();
+ method public void setVersion(String);
}
public class XmlParser {
ctor public XmlParser();
method public static hal.manifest.Manifest read(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
- method public static java.lang.String readText(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public static String readText(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
method public static void skip(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
}
diff --git a/xsd/halManifest/api/removed.txt b/xsd/halManifest/api/removed.txt
index e69de29..d802177 100644
--- a/xsd/halManifest/api/removed.txt
+++ b/xsd/halManifest/api/removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
