summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2022-12-09 10:28:14 -0800
committerXin Li <delphij@google.com>2022-12-09 10:28:14 -0800
commitd605f0d650f467d375342b2740f4894a8b57707b (patch)
treed556ca873013505191bd3b1554abeeacd352d750
parentf180675fc44c020f376f2cffb16c78ead67dd913 (diff)
parent887e475c8c90abbe5be91c8dd7504b097534a2f3 (diff)
downloadredfin-d605f0d650f467d375342b2740f4894a8b57707b.tar.gz
Merge Android 13 QPR1main-16k-with-phones
Bug: 261731544 Merged-In: I8ebc9fdfcf6f73ae4551acb1b082c26cb983e392 Change-Id: I7c7755a580eccebe4a59f013d5e65b72c07ec3fc
-rw-r--r--vf/device_framework_matrix_product.R.5.xml4
-rw-r--r--vf/device_framework_matrix_product.S.5.xml4
2 files changed, 4 insertions, 4 deletions
diff --git a/vf/device_framework_matrix_product.R.5.xml b/vf/device_framework_matrix_product.R.5.xml
index 2d7ba29..a00e40c 100644
--- a/vf/device_framework_matrix_product.R.5.xml
+++ b/vf/device_framework_matrix_product.R.5.xml
@@ -90,9 +90,9 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="aidl" optional="false">
<name>vendor.google.google_battery</name>
- <version>1.1-2</version>
+ <version>1</version>
<interface>
<name>IGoogleBattery</name>
<instance>default</instance>
diff --git a/vf/device_framework_matrix_product.S.5.xml b/vf/device_framework_matrix_product.S.5.xml
index ca45b30..04114ed 100644
--- a/vf/device_framework_matrix_product.S.5.xml
+++ b/vf/device_framework_matrix_product.S.5.xml
@@ -90,9 +90,9 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="aidl" optional="false">
<name>vendor.google.google_battery</name>
- <version>1.1-2</version>
+ <version>1</version>
<interface>
<name>IGoogleBattery</name>
<instance>default</instance>