libhidl: update from upstream
Followed instructions from go/nnapi-dep-instructions.
No manual changes / interventions have been made.
$ git merge cros/upstream/master --no-ff
$ repo upload --cbr . --no-verify
BUG=b:177048246
TEST=cq passes
Change-Id: I325d04330eafcfe79dc7efea49eac17e01ba32ec
diff --git a/Android.bp b/Android.bp
index 2593715..034919e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -69,6 +69,7 @@
native_bridge_supported: true,
recovery_available: true,
vendor_available: true,
+ product_available: true,
apex_available: [
// TODO(b/137948090): not fully supported in APEX for certain usecases
// - large dependency sizes
diff --git a/adapter/Android.bp b/adapter/Android.bp
index 07faa10..3dc382e 100644
--- a/adapter/Android.bp
+++ b/adapter/Android.bp
@@ -16,6 +16,7 @@
name: "libhidladapter",
defaults: ["libhidl-defaults"],
vendor_available: true,
+ product_available: true,
// TODO(b/153609531): remove when no longer needed.
native_bridge_supported: true,
srcs: [
diff --git a/base/include/hidl/MQDescriptor.h b/base/include/hidl/MQDescriptor.h
index 786c1be..0429444 100644
--- a/base/include/hidl/MQDescriptor.h
+++ b/base/include/hidl/MQDescriptor.h
@@ -57,12 +57,6 @@
return mGrantors;
}
- // This should be removed if no one is using it. We shouldn't be returning
- // a mutable reference if it's not necessary. TODO(b/162465295).
- inline ::android::hardware::hidl_vec<GrantorDescriptor> &grantors() {
- return mGrantors;
- }
-
inline const ::native_handle_t *handle() const {
return mHandle;
}
diff --git a/libhidlmemory/Android.bp b/libhidlmemory/Android.bp
index d3bef74..547be11 100644
--- a/libhidlmemory/Android.bp
+++ b/libhidlmemory/Android.bp
@@ -15,6 +15,7 @@
cc_library {
name: "libhidlmemory",
vendor_available: true,
+ product_available: true,
// Host support is needed for testing only
host_supported: true,
// TODO(b/153609531): remove when no longer needed.
diff --git a/vintfdata/manifest.xml b/vintfdata/manifest.xml
index e204671..8fd69b9 100644
--- a/vintfdata/manifest.xml
+++ b/vintfdata/manifest.xml
@@ -35,7 +35,12 @@
<instance>default</instance>
</interface>
</hal>
- <hal>
+ <!--
+ Instead of calling this, prefer to set priority in init .rc files via
+ `ioprio <class> <priority>`. For more information, see
+ system/core/init/README.md
+ -->
+ <hal max-level="5">
<name>android.frameworks.schedulerservice</name>
<transport>hwbinder</transport>
<version>1.0</version>
