From a163f6db9fad94c8d722115c2d54b1f97c2db571 Mon Sep 17 00:00:00 2001
From: Junkyu Kang <junkyukang@google.com>
Date: Wed, 15 Jun 2022 16:42:14 +0800
Subject: [PATCH 1/3] gps: enable SUPL OTDOA capable for VZW

Bug: 233849643
Test: confirm config is correct
Change-Id: I72a8c709b1dbfae5697cf14dc5e96585893c5d62
---
 gps.xml.l10      | 1 +
 gps_user.xml.l10 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/gps.xml.l10 b/gps.xml.l10
index d8d896f..a98ea61 100644
--- a/gps.xml.l10
+++ b/gps.xml.l10
@@ -32,6 +32,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/gps_user.xml.l10 b/gps_user.xml.l10
index caf5bd5..a982f5e 100644
--- a/gps_user.xml.l10
+++ b/gps_user.xml.l10
@@ -31,6 +31,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"

From 75d21eca514ab05f710f7487d2ba3b21bdd63eca Mon Sep 17 00:00:00 2001
From: timothywang <timothywang@google.com>
Date: Tue, 31 May 2022 10:14:00 +0800
Subject: [PATCH 2/3] Add system property for 1080p 60fps binning mode

Bug: 234324271
Test: GCA
Change-Id: I4ac2614ac5ef781f3d413c070503c6d28631415c
---
 device-lynx.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/device-lynx.mk b/device-lynx.mk
index 5e7a3c6..d9e9d01 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -184,6 +184,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.camera.extended_launch_boost=1 \
 	persist.vendor.camera.raise_buf_allocation_priority=1
 
+# Enable camera 1080P 60FPS binning mode
+PRODUCT_VENDOR_PROPERTIES += \
+    persist.vendor.camera.1080P_60fps_binning=true
+
 # Bluetooth LE Audio
 PRODUCT_PRODUCT_PROPERTIES += \
 	ro.bluetooth.leaudio_switcher.supported=true \

From 5460d349fc33b543520e44712f73f2535c861bc5 Mon Sep 17 00:00:00 2001
From: timothywang <timothywang@google.com>
Date: Mon, 6 Jun 2022 16:56:51 +0800
Subject: [PATCH 3/3] Update 1080p 60fps binning mode settings

Keep rear main camera as full video mode.

Bug: 234324271
Test: GCA
Change-Id: I233dd7e7f3a0c0708784b996f5e16817a3fb2a57
---
 device-lynx.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/device-lynx.mk b/device-lynx.mk
index d9e9d01..09b821c 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -188,6 +188,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.1080P_60fps_binning=true
 
+# Limit camera 1080P 60FPS binning mode to not rear main camera
+PRODUCT_VENDOR_PROPERTIES += \
+    persist.vendor.camera.1080P_60fps_binning_except_rear_main=true
+
 # Bluetooth LE Audio
 PRODUCT_PRODUCT_PROPERTIES += \
 	ro.bluetooth.leaudio_switcher.supported=true \