Snap for 9551305 from 91aefea8531870f748c8b6b827ee14369dc20c0f to mainline-tzdata5-release

Change-Id: Ia2c4546525c1fa256bf38309b970726f664d65f9

17 files changed, 433 insertions, 18 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index bc17b20..1dc1835 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -17,6 +17,7 @@
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_redfin.mk \
     $(LOCAL_DIR)/aosp_redfin_64.mk \
+    $(LOCAL_DIR)/aosp_redfin_64_with_32.mk \
     $(LOCAL_DIR)/vf/aosp_redfin_vf.mk \
     $(LOCAL_DIR)/aosp_redfin_hwasan.mk \
 
diff --git a/aosp_redfin_64_with_32.mk b/aosp_redfin_64_with_32.mk
new file mode 100644
index 0000000..bfb2c91
--- /dev/null
+++ b/aosp_redfin_64_with_32.mk
@@ -0,0 +1,26 @@
+#
+# Copyright 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Build all of the 32 bit code, but only the vendor partition enables 64 bit.
+ZYGOTE_FORCE_64 := true
+
+# Force any prefer32 targets to be compiled as 64 bit.
+IGNORE_PREFER32_ON_DEVICE := true
+
+$(call inherit-product, device/google/redfin/aosp_redfin.mk)
+
+PRODUCT_NAME := aosp_redfin_64_with_32
+PRODUCT_MODEL := AOSP on Redfin 64-bit only zygote with 32 bit support
diff --git a/device-redfin.mk b/device-redfin.mk
index fa45916..a1b9608 100644
--- a/device-redfin.mk
+++ b/device-redfin.mk
@@ -242,3 +242,7 @@ PRODUCT_PACKAGES += \
 ifneq ($(PRODUCT_VENDOR_FREEZE_SYSTEM_BUILD),true)
 PRODUCT_PACKAGES += redfin_product_compatibility_matrix.xml
 endif
+
+# Workaround for prebuilt Qualcomm neural network HAL
+PRODUCT_PACKAGES += \
+    libprotobuf-cpp-full-3.9.1-vendorcompat
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index f3fcd07..89b8e87 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -1,10 +1,3 @@
 <compatibility-matrix version="1.0" type="framework" level="5">
-    <hal format="hidl" optional="true">
-        <name>vendor.google.wireless_charger</name>
-        <version>1.3</version>
-        <interface>
-            <name>IWirelessCharger</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
+
 </compatibility-matrix>
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 85f8ed0..2b529c4 100755
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -516,6 +516,7 @@ static void DumpSensorLog(int fd) {
 
 static void DumpF2FS(int fd) {
     DumpFileToFd(fd, "F2FS", "/sys/kernel/debug/f2fs/status");
+    DumpFileToFd(fd, "F2FS", "/dev/fscklogs/fsck");
     RunCommandToFd(fd, "F2FS - fsck time (ms)", {"/vendor/bin/sh", "-c", "getprop ro.boottime.init.fsck.data"});
     RunCommandToFd(fd, "F2FS - checkpoint=disable time (ms)", {"/vendor/bin/sh", "-c", "getprop ro.boottime.init.mount.data"});
 }
diff --git a/init.recovery.device.rc b/init.recovery.device.rc
index 7df16ec..596e813 100644
--- a/init.recovery.device.rc
+++ b/init.recovery.device.rc
@@ -3,6 +3,7 @@ on fs
     symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice
 
 on init
+    wait /sys/devices/platform/soc/a600000.ssusb/a600000.dwc3/driver 10
     setprop sys.usb.configfs 1
     # Don't lose recovery logs- keep warm reset for coming out of recovery.
     write /sys/module/msm_poweroff/parameters/warm_reset 1
diff --git a/redfin/BoardConfig.mk b/redfin/BoardConfig.mk
index 8e371df..1bcb070 100644
--- a/redfin/BoardConfig.mk
+++ b/redfin/BoardConfig.mk
@@ -14,8 +14,11 @@
 # limitations under the License.
 #
 
-ifdef PHONE_CAR_BOARD_PRODUCT
-  include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
+ifdef AUTOMOTIVE_PRODUCT_PATH
+  #RBC# include_top device/google/auto_tcu
+  #RBC# include_top device/google/pixel_tcu
+  #RBC# include_top device/google_car
+  include device/$(AUTOMOTIVE_PRODUCT_PATH)/BoardConfig.mk
 else
   TARGET_BOOTLOADER_BOARD_NAME := redfin
   TARGET_SCREEN_DENSITY := 440
diff --git a/redfin/overlay/frameworks/base/core/res/res/values/config.xml b/redfin/overlay/frameworks/base/core/res/res/values/config.xml
index 2eb7f2c..56b2b1c 100755
--- a/redfin/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/redfin/overlay/frameworks/base/core/res/res/values/config.xml
@@ -278,4 +278,17 @@
 
     <!-- the number of the max cached processes in the system. -->
     <integer name="config_customizedMaxCachedProcesses">64</integer>
+
+    <!-- A string config in svg path format for the main display shape.
+         (@see https://www.w3.org/TR/SVG/paths.html#PathData).
+
+         This config must be set unless:
+         1. {@link Configuration#isScreenRound} is true which means the display shape is circular
+            and the system will auto-generate a circular shape.
+         2. The display has no rounded corner and the system will auto-generate a rectangular shape.
+         (@see DisplayShape#createDefaultDisplayShape)
+
+         Note: If the display supports multiple resolutions, please define the path config based on
+         the highest resolution so that it can be scaled correctly in each resolution. -->
+    <string name="config_mainDisplayShape">M 0 0 L 0 2340 L 1080 2340 L 1080 0 L 1079.9258 0 L 1079.9961 216 C 1079.9961 187.36006 1080.1276 148.13971 1078.7676 119.50977 C 1078.3576 110.89977 1077.7959 102.31975 1076.8359 93.759766 C 1076.0059 86.30978 1074.8876 78.950375 1073.0977 71.650391 C 1071.3377 64.490405 1068.9864 57.68983 1065.6465 51.089844 C 1061.6565 43.189863 1056.5277 36.09983 1050.2578 29.839844 C 1043.9979 23.579856 1036.9077 18.460695 1029.0078 14.470703 C 1022.3979 11.140709 1015.5974 8.789059 1008.4375 7.0390625 C 1001.1376 5.2490661 993.77823 4.1307796 986.31836 3.3007812 C 977.74852 2.3407832 969.16846 1.7791398 960.55859 1.3691406 C 931.8991 0.00914337 892.65949 0.15039062 864 0.15039062 L 1079.9258 0 L 0.07421875 0 L 216 0.15039062 C 187.34051 0.15039063 148.1009 0.00914337 119.44141 1.3691406 C 110.83154 1.7791398 102.25149 2.3407832 93.681641 3.3007812 C 86.22177 4.1307796 78.862373 5.2490661 71.5625 7.0390625 C 64.402625 8.7890591 57.602072 11.140709 50.992188 14.470703 C 43.092325 18.460695 36.002077 23.579856 29.742188 29.839844 C 23.472297 36.09983 18.343447 43.18986 14.353516 51.089844 C 11.013574 57.68983 8.6623129 64.490405 6.9023438 71.650391 C 5.1123749 78.950375 3.994048 86.30978 3.1640625 93.759766 C 2.2040793 102.31975 1.6424147 110.89977 1.2324219 119.50977 C -0.12755439 148.13971 0.00390625 187.36006 0.00390625 216 L 0.07421875 0 L 0 0 z M 0.00390625 2103 C 0.00390625 2132.1097 -0.10716124 2185.6894 0.96484375 2214.7891 C 1.3355369 2224.8589 1.8673045 2234.8788 3.0996094 2244.8887 C 4.1615956 2253.4486 5.7431471 2261.7689 8.4882812 2269.9688 C 11.253453 2278.2185 14.961912 2285.7476 19.871094 2292.9375 C 25.551717 2301.2774 32.563821 2308.6366 40.628906 2314.7266 C 56.218063 2326.5064 73.40016 2331.8675 92.195312 2334.8574 C 100.87153 2336.2374 109.5681 2337.0773 118.31445 2337.6973 C 128.20295 2338.3973 138.10124 2338.8074 148.00977 2339.1074 C 180.89126 2340.0974 227.1185 2339.998 260 2339.998 L 0.00390625 2339.998 L 0.00390625 2103 z M 1079.9961 2103 L 1079.9961 2339.998 L 820 2339.998 C 852.8815 2339.998 899.10874 2340.0974 931.99023 2339.1074 C 941.89876 2338.8074 951.79705 2338.3973 961.68555 2337.6973 C 970.4319 2337.0773 979.12847 2336.2374 987.80469 2334.8574 C 1006.5999 2331.8675 1023.7819 2326.5064 1039.3711 2314.7266 C 1047.4362 2308.6366 1054.4483 2301.2774 1060.1289 2292.9375 C 1065.0381 2285.7476 1068.7465 2278.2185 1071.5117 2269.9688 C 1074.2569 2261.7689 1075.8384 2253.4486 1076.9004 2244.8887 C 1078.1327 2234.8788 1078.6645 2224.8589 1079.0352 2214.7891 C 1080.1072 2185.6894 1079.9961 2132.1097 1079.9961 2103 z</string>
 </resources>
diff --git a/redfin/overlay/packages/apps/Nfc/res/values/config.xml b/redfin/overlay/packages/apps/Nfc/res/values/config.xml
index 6bf40a0..126e096 100644
--- a/redfin/overlay/packages/apps/Nfc/res/values/config.xml
+++ b/redfin/overlay/packages/apps/Nfc/res/values/config.xml
@@ -24,4 +24,5 @@
     <item>GTT9Q</item>
     <item>G5NZ6</item>
   </string-array>
+  <bool name="tag_intent_app_pref_supported">true</bool>
 </resources>
diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp
index 4f5d599..80a2824 100644
--- a/usb/usb/Android.bp
+++ b/usb/usb/Android.bp
@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 cc_binary {
     name: "android.hardware.usb-service.redfin",
     relative_install_path: "hw",
diff --git a/vf/Android.bp b/vf/Android.bp
index c8b5215..fc3e482 100644
--- a/vf/Android.bp
+++ b/vf/Android.bp
@@ -19,3 +19,12 @@ vintf_compatibility_matrix {
         "device_framework_matrix_product.S.5.xml",
     ],
 }
+
+vintf_compatibility_matrix {
+    name: "redfin_product_compatibility_matrix.T.7.xml",
+    stem: "compatibility_matrix.redfin.T.7.xml",
+    product_specific: true,
+    srcs: [
+        "device_framework_matrix_product.T.7.xml",
+    ],
+}
diff --git a/vf/OWNERS b/vf/OWNERS
index 6c5075e..b6c849c 100644
--- a/vf/OWNERS
+++ b/vf/OWNERS
@@ -1,7 +1,5 @@
 # Treble team for Vendor Freeze
-bpeckham@google.com
-chrisgross@google.com
-danielnorman@google.com
+deyaoren@google.com
 inseob@google.com
-jjdemartino@google.com
+jgalmes@google.com
 justinyun@google.com
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>
diff --git a/vf/device_framework_matrix_product.T.7.xml b/vf/device_framework_matrix_product.T.7.xml
new file mode 100644
index 0000000..0da5010
--- /dev/null
+++ b/vf/device_framework_matrix_product.T.7.xml
@@ -0,0 +1,345 @@
+<compatibility-matrix version="1.0" type="framework" level="7">
+   <hal format="hidl" optional="false">
+       <name>com.qualcomm.qti.imscmservice</name>
+       <version>2.2</version>
+       <interface>
+         <name>IImsCmService</name>
+         <instance>qti.ims.connectionmanagerservice</instance>
+       </interface>
+   </hal>
+    <hal format="hidl" optional="false">
+        <name>com.qualcomm.qti.uceservice</name>
+        <version>2.3</version>
+        <interface>
+            <name>IUceService</name>
+            <instance>com.qualcomm.qti.uceservice</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.ims.factory</name>
+        <version>1.0</version>
+        <interface>
+            <name>IImsFactory</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.data.factory</name>
+        <version>2.2</version>
+        <interface>
+            <name>IFactory</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <!-- iwlan -->
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.hardware.data.iwlan</name>
+        <version>1.0</version>
+        <interface>
+            <name>IIWlan</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.hardware.media.c2</name>
+        <version>1.0</version>
+        <interface>
+            <name>IComponentStore</name>
+            <instance>default</instance>
+            <instance>software</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.hardware.radio</name>
+        <version>1.2</version>
+        <interface>
+            <name>ISap</name>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.hardware.radio.config</name>
+        <version>1.1</version>
+        <interface>
+            <name>IRadioConfig</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.display.color</name>
+        <version>1.0-5</version>
+        <interface>
+             <name>IDisplayColor</name>
+             <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.display.config</name>
+        <version>2.0</version>
+        <interface>
+            <name>IDisplayConfig</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.display.postproc</name>
+        <version>1.0</version>
+        <interface>
+             <name>IDisplayPostproc</name>
+             <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.google.google_battery</name>
+        <version>1.2</version>
+        <interface>
+            <name>IGoogleBattery</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.google.radioext</name>
+        <version>1.2-3</version>
+        <interface>
+            <name>IRadioExt</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.hardware.radio.am</name>
+        <version>1.0</version>
+        <interface>
+            <name>IQcRilAudio</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.hardware.radio.ims</name>
+        <version>1.6</version>
+        <interface>
+            <name>IImsRadio</name>
+            <instance>imsradio0</instance>
+            <instance>imsradio1</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.hardware.radio.lpa</name>
+        <version>1.0</version>
+        <interface>
+            <name>IUimLpa</name>
+            <instance>UimLpa0</instance>
+            <instance>UimLpa1</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.hardware.radio.qcrilhook</name>
+        <version>1.0</version>
+        <interface>
+            <name>IQtiOemHook</name>
+            <instance>oemhook0</instance>
+            <instance>oemhook1</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.hardware.radio.uim</name>
+        <version>1.2</version>
+        <interface>
+            <name>IUim</name>
+            <instance>Uim0</instance>
+            <instance>Uim1</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.hardware.radio.uim_remote_client</name>
+        <version>1.0</version>
+        <interface>
+            <name>IUimRemoteServiceClient</name>
+            <instance>uimRemoteClient0</instance>
+            <instance>uimRemoteClient1</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.hardware.radio.uim_remote_server</name>
+        <version>1.0</version>
+        <interface>
+            <name>IUimRemoteServiceServer</name>
+            <instance>uimRemoteServer0</instance>
+            <instance>uimRemoteServer1</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.hardware.tui_comm</name>
+        <version>1.0</version>
+        <interface>
+            <name>ITuiComm</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.hardware.display.allocator</name>
+        <version>1.0</version>
+        <version>3.0</version>
+        <version>4.0</version>
+        <interface>
+            <name>IQtiAllocator</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.hardware.display.mapper</name>
+        <version>2.0</version>
+        <version>3.0</version>
+        <version>4.0</version>
+        <interface>
+            <name>IQtiMapper</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.hardware.display.composer</name>
+        <version>3.0</version>
+        <interface>
+            <name>IQtiComposer</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.hardware.radio.internal.deviceinfo</name>
+        <version>1.0</version>
+        <interface>
+            <name>IDeviceInfo</name>
+            <instance>deviceinfo</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.imsrtpservice</name>
+        <version>3.0</version>
+        <interface>
+            <name>IRTPService</name>
+            <instance>imsrtpservice</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.ims.callinfo</name>
+        <version>1.0</version>
+        <interface>
+            <name>IService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>hardware.google.bluetooth.sar</name>
+        <version>1.0</version>
+        <interface>
+            <name>IBluetoothSar</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>hardware.google.bluetooth.bt_channel_avoidance</name>
+        <version>1.0</version>
+        <interface>
+            <name>IBTChannelAvoidance</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.google.wifi_ext</name>
+        <version>1.3</version>
+        <interface>
+            <name>IWifiExt</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.hardware.cacert</name>
+        <version>1.0</version>
+        <interface>
+            <name>IService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.hardware.data.connection</name>
+        <version>1.1</version>
+        <interface>
+            <name>IDataConnection</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.hardware.radio.qtiradio</name>
+        <version>1.0</version>
+        <interface>
+            <name>IQtiRadio</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.hardware.radio.qtiradio</name>
+        <version>2.4</version>
+        <interface>
+            <name>IQtiRadio</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
+    <!-- QSEECom HAL service -->
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.hardware.qseecom</name>
+        <version>1.0</version>
+        <interface>
+            <name>IQSEECom</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <!-- QSPM HAL service -->
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.qspmhal</name>
+        <version>1.0</version>
+        <interface>
+            <name>IQspmhal</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.hardware.qteeconnector</name>
+        <version>1.0</version>
+        <interface>
+            <name>IAppConnector</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IGPAppConnector</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="false">
+         <name>com.google.hardware.pixel.display</name>
+         <interface>
+             <name>IDisplay</name>
+             <instance>default</instance>
+         </interface>
+    </hal>
+    <!-- DSP Service -->
+    <hal format="hidl" optional="false">
+        <name>vendor.qti.hardware.dsp</name>
+        <version>1.0</version>
+        <interface>
+            <name>IDspService</name>
+            <instance>dspservice</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>vendor.google.wireless_charger</name>
+        <version>1.3</version>
+        <interface>
+            <name>IWirelessCharger</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</compatibility-matrix>
diff --git a/wireless_charger/compatibility_matrix.xml b/wireless_charger/compatibility_matrix.xml
new file mode 100644
index 0000000..d0adcde
--- /dev/null
+++ b/wireless_charger/compatibility_matrix.xml
@@ -0,0 +1,10 @@
+<compatibility-matrix version="1.0" type="framework" level="7">
+    <hal format="aidl" optional="true">
+        <name>vendor.google.wireless_charger</name>
+        <version>1</version>
+        <interface>
+            <name>IWirelessCharger</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</compatibility-matrix>
diff --git a/wireless_charger/wireless_charger.mk b/wireless_charger/wireless_charger.mk
new file mode 100644
index 0000000..67b72d0
--- /dev/null
+++ b/wireless_charger/wireless_charger.mk
@@ -0,0 +1,6 @@
+# This wireless_charger folder is used to keep the compatibility for later google devices
+PRODUCT_SOONG_NAMESPACES += vendor/google/interfaces
+PRODUCT_PACKAGES += vendor.google.wireless_charger-default
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/redfin/wireless_charger/compatibility_matrix.xml
+
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/redfin-sepolicy/wireless_charger