Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: Ic565eeda1ec928e59be8a3a2c406ab799ef879a0
Change-Id: I41325acda1e8805b210b589f69ed2b70e047ce66
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 @@
"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 @@
"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>
