Snap for 9550355 from a0e019b29f2f68f14be254379eb47d731bec782a to sdk-release
Change-Id: Ie029459bfde7693133620b8bbd2f32d7954966dd
diff --git a/Android.bp b/Android.bp
index c5d129e..670ee39 100644
--- a/Android.bp
+++ b/Android.bp
@@ -48,6 +48,7 @@
cc_library_headers {
name: "libhidl_gtest_helper",
+ vendor_available: true,
host_supported: true,
export_include_dirs: ["gtest_helper"],
}
@@ -97,7 +98,7 @@
"//apex_available:platform",
"com.android.neuralnetworks",
"test_com.android.neuralnetworks",
- "com.android.bluetooth",
+ "com.android.btservices",
"com.android.media",
"com.android.media.swcodec",
"com.android.tethering",
@@ -111,6 +112,9 @@
],
min_sdk_version: "29",
afdo: true,
+ header_abi_checker: {
+ diff_flags: ["-allow-adding-removing-weak-symbols"],
+ },
}
// WARNING: deprecated
diff --git a/vintfdata/README.md b/vintfdata/README.md
index cfc1da7..6116757 100644
--- a/vintfdata/README.md
+++ b/vintfdata/README.md
@@ -70,7 +70,7 @@
Execute the following, replacing the argument with the level to freeze:
```shell script
-lunch cf_x86_phone-userdebug # or any generic target
+lunch aosp_arm64
LEVEL=5
./freeze.sh ${LEVEL}
```
diff --git a/vintfdata/device_compatibility_matrix.default.xml b/vintfdata/device_compatibility_matrix.default.xml
index eaa513e..70d23e2 100644
--- a/vintfdata/device_compatibility_matrix.default.xml
+++ b/vintfdata/device_compatibility_matrix.default.xml
@@ -1,5 +1,5 @@
<compatibility-matrix version="1.0" type="device">
- <hal format="hidl" optional="false">
+ <hal format="hidl" optional="true">
<name>android.hidl.manager</name>
<version>1.0</version>
<interface>
diff --git a/vintfdata/manifest.xml b/vintfdata/manifest.xml
index c38a2a2..b3d84aa 100644
--- a/vintfdata/manifest.xml
+++ b/vintfdata/manifest.xml
@@ -1,14 +1,5 @@
<manifest version="1.0" type="framework">
- <hal>
- <name>android.hidl.manager</name>
- <transport>hwbinder</transport>
- <version>1.2</version>
- <interface>
- <name>IServiceManager</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal>
+ <hal format="hidl">
<name>android.hidl.memory</name>
<transport arch="32+64">passthrough</transport>
<version>1.0</version>
@@ -17,16 +8,7 @@
<instance>ashmem</instance>
</interface>
</hal>
- <hal>
- <name>android.hidl.token</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>ITokenManager</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal max-level="6">
+ <hal format="hidl" max-level="6">
<name>android.frameworks.displayservice</name>
<transport>hwbinder</transport>
<version>1.0</version>
@@ -40,7 +22,7 @@
`ioprio <class> <priority>`. For more information, see
system/core/init/README.md
-->
- <hal max-level="5">
+ <hal format="hidl" max-level="5">
<name>android.frameworks.schedulerservice</name>
<transport>hwbinder</transport>
<version>1.0</version>
@@ -49,7 +31,12 @@
<instance>default</instance>
</interface>
</hal>
- <hal>
+ <hal format="aidl">
+ <name>android.frameworks.sensorservice</name>
+ <version>1</version>
+ <fqname>ISensorManager/default</fqname>
+ </hal>
+ <hal format="hidl">
<name>android.frameworks.sensorservice</name>
<transport>hwbinder</transport>
<version>1.0</version>
@@ -58,7 +45,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal max-level="7">
+ <hal format="hidl" max-level="7">
<name>android.system.net.netd</name>
<transport>hwbinder</transport>
<version>1.1</version>
@@ -67,7 +54,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal>
+ <hal format="hidl">
<name>android.system.wifi.keystore</name>
<transport>hwbinder</transport>
<version>1.0</version>
