From 179dbd458cac4a7672195db4670471c333b51512 Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Mon, 8 May 2023 06:45:41 +0000 Subject: [PATCH 1/3] gps: separate sdk version - release stable sdk version to factory image Bug: 281464842 Test: verify sdk version at b/281464842 Change-Id: I539ca681425cda69e545f0f693a936017eb0a548 --- device.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 6273f33c..76d86949 100644 --- a/device.mk +++ b/device.mk @@ -39,7 +39,12 @@ include device/google/gs-common/widevine/widevine.mk include device/google/zuma/dumpstate/item.mk ifneq ($(BOARD_WITHOUT_RADIO),true) -include device/google/gs-common/gps/brcm/device_v2.mk +# Release stable version to factory image +ifneq ($(filter factory_%,$(TARGET_PRODUCT)),) + include device/google/gs-common/gps/brcm/device.mk +else + include device/google/gs-common/gps/brcm/device_v2.mk +endif endif TARGET_BOARD_PLATFORM := zuma From 02859551dfba8efd8ba2fb46991ae580e762de8f Mon Sep 17 00:00:00 2001 From: Speth Chang Date: Mon, 8 May 2023 11:11:08 +0000 Subject: [PATCH 2/3] Remove camera multicam property setup The property was re-named and default enabled. Bug: 281468569 Test: build pass Change-Id: I01eef2e4cb6dd8837346a3bc86596e8fd29789e5 --- device.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device.mk b/device.mk index 6273f33c..5fd232eb 100644 --- a/device.mk +++ b/device.mk @@ -650,10 +650,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ debug.sf.enable_gl_backpressure=1 \ debug.sf.enable_sdr_dimming=1 -# Camera -PRODUCT_PROPERTY_OVERRIDES += \ - vendor.camera.multicam.enable_p23_multicam=true - PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.use_phase_offsets_as_durations=1 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.late.sf.duration=10500000 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.late.app.duration=16600000 From 9a08596554e1b2ecc2558110a454a62c688e3ff2 Mon Sep 17 00:00:00 2001 From: Mahesh Kallelil Date: Mon, 24 Apr 2023 18:41:21 -0700 Subject: [PATCH 3/3] Set owner as system for logbuffer_cpif Setting the owner of /dev/logbuffer_cpif as system to allow the dump_modem script to read the logs as part of bugreport Test: Tested bugreport on P23 Bug: 278501642 Change-Id: I336d712ea9e4bc2cfe08195f64089b68dd283fe6 Signed-off-by: Mahesh Kallelil --- conf/init.zuma.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc index ff5f0231..cd6a5d25 100644 --- a/conf/init.zuma.rc +++ b/conf/init.zuma.rc @@ -503,6 +503,7 @@ on early-boot chown system system /dev/logbuffer_pcie0 chown system system /dev/logbuffer_pcie1 chown system system /dev/logbuffer_bd + chown system system /dev/logbuffer_cpif on boot