diff options
| author | Xin Li <delphij@google.com> | 2024-01-17 22:13:05 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2024-01-17 22:13:05 -0800 |
| commit | 092e9507a195286651698a28799590f81f615a19 (patch) | |
| tree | 6d614c2082e04670db5abd2c77ee6c7268c74e4e | |
| parent | 2585699ae73b2679812facd7496a74199c896d98 (diff) | |
| parent | 7d20bba6167877b646f298dc5eeb362f682d4c08 (diff) | |
| download | redfin-092e9507a195286651698a28799590f81f615a19.tar.gz | |
Merge Android 24Q1 Release (ab/11220357)temp_319669529
Bug: 319669529
Merged-In: Ic565eeda1ec928e59be8a3a2c406ab799ef879a0
Change-Id: I41325acda1e8805b210b589f69ed2b70e047ce66
| -rw-r--r-- | usb/usb/Android.bp | 4 | ||||
| -rw-r--r-- | wireless_charger/compatibility_matrix.xml | 2 |
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> |