Merge Android 14 QPR2 to AOSP main

Bug: 319669529
Merged-In: I41325acda1e8805b210b589f69ed2b70e047ce66
Change-Id: I191e783bd56684e501f75ad716f008b7565eb13f
This commit is contained in:
Xin Li
2024-03-06 09:29:49 -08:00
2 changed files with 3 additions and 3 deletions

View File

@@ -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",
],
}

View File

@@ -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>