From f88a7293d2ba8821cdaee095efd4fc6719d83b19 Mon Sep 17 00:00:00 2001
From: Edwin Tung <edwintung@google.com>
Date: Tue, 6 Aug 2024 12:03:39 +0800
Subject: [PATCH 1/2] gps: update gps version 4.15.1_22_240809_R1_230606

Add chip config line to control timemark (1pps) output

Bug: 306725234

Test: b/357740920
atest CtsLocationGnssTestCases
atest VtsHalGnssTargetTest

Change-Id: I3320b3c48b739acbb0f83aa21ee9495830dd6653
---
 location/gps.cfg      | 3 +++
 location/gps_user.cfg | 1 +
 2 files changed, 4 insertions(+)

diff --git a/location/gps.cfg b/location/gps.cfg
index 4fc7156..6a6ec32 100644
--- a/location/gps.cfg
+++ b/location/gps.cfg
@@ -24,6 +24,9 @@ gnss_device_type=K041
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
 
+# 1pps timemark output: 0: disable 1: enable
+ChipCfg_Timemark_Option=1
+
 # Enable/Disable 1PPS Time Sync policy
 Is1PPSTimeSyncEnable=1
 
diff --git a/location/gps_user.cfg b/location/gps_user.cfg
index b20dfe5..c612ea2 100644
--- a/location/gps_user.cfg
+++ b/location/gps_user.cfg
@@ -10,6 +10,7 @@ caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 gnss_device_type=K041
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
+ChipCfg_Timemark_Option=1
 Is1PPSTimeSyncEnable=1
 Chip_Configuration_Dynamic_HSI=0
 Chip_Configuration_ubsan_opt=1

From 94af34f2ce217af8131ff09b20d6d066450d8b7b Mon Sep 17 00:00:00 2001
From: Kimi Hsu <kimih@google.com>
Date: Tue, 30 Jul 2024 10:21:58 +0000
Subject: [PATCH 2/2] Set a proper status bar height

Bug: 352838267
Test: make and boot
Flag: EXEMPT bugfix

Change-Id: I04ab3af793b5f708be62e251b0f2f608689cadec
---
 .../frameworks/base/core/res/res/values/config.xml        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tegu/overlay/frameworks/base/core/res/res/values/config.xml b/tegu/overlay/frameworks/base/core/res/res/values/config.xml
index 5a0be95..f559079 100644
--- a/tegu/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/tegu/overlay/frameworks/base/core/res/res/values/config.xml
@@ -175,6 +175,14 @@
     <dimen name="rounded_corner_radius_top">115px</dimen>
     <dimen name="rounded_corner_radius_bottom">115px</dimen>
 
+    <!-- Align to camera cutout's height. -->
+    <dimen name="status_bar_height_portrait">52dp</dimen>
+
+    <!-- Since @dimen/status_bar_height_portrait is modified in overlay, need to restore its value
+         from original folder. This should be done even looks no effect on some apps because
+         some other apps may reference to it. -->
+    <dimen name="status_bar_height_landscape">24dp</dimen>
+
      <!-- Whether the display cutout region of the main built-in display should be forced to
         black in software (to avoid aliasing or emulate a cutout that is not physically existent).
     -->