From be78bf5b343445d2721b9973b9bdc4c238c2b322 Mon Sep 17 00:00:00 2001
From: linpeter <linpeter@google.com>
Date: Mon, 19 Sep 2022 18:35:29 +0800
Subject: [PATCH 1/2] Update IDisplay to V7

Bug: 241969007
Change-Id: Ic73764a6f856c135a4c078fafdfc15e45766e0c1
---
 device_framework_matrix_product.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index a9f026ee..2b7cfe56 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -74,7 +74,7 @@
     </hal>
     <hal format="aidl" optional="true">
       <name>com.google.hardware.pixel.display</name>
-        <version>6</version>
+        <version>7</version>
         <interface>
             <name>IDisplay</name>
             <instance>default</instance>

From 74ab1294e93f9ed173100f2e52c2e86d1f2c2725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= <krzysio@google.com>
Date: Thu, 13 Oct 2022 05:01:32 +0000
Subject: [PATCH 2/2] Remove inclusion of deleted USF makefile.

Bug: 250027581
Test: presubmit
Change-Id: Iee2b7354e7a1033b3be5b30c85e3555ea07312c3
---
 device.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/device.mk b/device.mk
index 71dce6c2..cf2b7417 100644
--- a/device.mk
+++ b/device.mk
@@ -945,11 +945,7 @@ endif
 #$(call inherit-product-if-exists, hardware/google_devices/gs101/gs101.mk)
 #$(call inherit-product-if-exists, vendor/google_devices/common/exynos-vendor.mk)
 #$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/device-bcm.mk)
-ifeq ($(wildcard vendor/google/sensors/usf),)
-$(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/usf/usf_product.mk)
-else
 $(call inherit-product-if-exists, vendor/google/sensors/usf/android/usf_efw_product.mk)
-endif
 $(call inherit-product-if-exists, vendor/google/services/LyricCameraHAL/src/build/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google/camera/devices/whi/device-vendor.mk)