summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2024-03-06 09:29:49 -0800
committerXin Li <delphij@google.com>2024-03-06 09:29:49 -0800
commitdfd63b7edc987c259725c24d32dcceaf71376896 (patch)
tree6d614c2082e04670db5abd2c77ee6c7268c74e4e
parentc9084eb71119f1bdbeccce9f0b245f04aa147318 (diff)
parent092e9507a195286651698a28799590f81f615a19 (diff)
downloadredfin-main.tar.gz
Merge Android 14 QPR2 to AOSP mainHEADmastermain
Bug: 319669529 Merged-In: I41325acda1e8805b210b589f69ed2b70e047ce66 Change-Id: I191e783bd56684e501f75ad716f008b7565eb13f
-rw-r--r--usb/usb/Android.bp4
-rw-r--r--wireless_charger/compatibility_matrix.xml2
2 files changed, 3 insertions, 3 deletions
diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp
index 80a2824..d9ca00f 100644
--- a/usb/usb/Android.bp
+++ b/usb/usb/Android.bp
@@ -38,7 +38,7 @@ cc_binary {
"android.hardware.usb.gadget@1.0",
"android.hardware.usb-V1-ndk",
"libcutils",
- "android.frameworks.stats-V1-ndk",
+ "android.frameworks.stats-V2-ndk",
"pixelatoms-cpp",
"libbinder_ndk",
@@ -48,7 +48,7 @@ cc_binary {
"libpixelstats",
],
export_shared_lib_headers: [
- "android.frameworks.stats-V1-ndk",
+ "android.frameworks.stats-V2-ndk",
"pixelatoms-cpp",
],
}
diff --git a/wireless_charger/compatibility_matrix.xml b/wireless_charger/compatibility_matrix.xml
index d0adcde..e0e575b 100644
--- a/wireless_charger/compatibility_matrix.xml
+++ b/wireless_charger/compatibility_matrix.xml
@@ -1,7 +1,7 @@
<compatibility-matrix version="1.0" type="framework" level="7">
<hal format="aidl" optional="true">
<name>vendor.google.wireless_charger</name>
- <version>1</version>
+ <version>1-2</version>
<interface>
<name>IWirelessCharger</name>
<instance>default</instance>