From d1d703bb79ab6bb5d4ce1ff89bab17d5f0dcb2ec Mon Sep 17 00:00:00 2001 From: Sergey Volk Date: Wed, 13 Sep 2023 21:54:50 +0000 Subject: [PATCH 1/4] DO NOT MERGE displayport: Move displayport configuration to device. Move displayport configuration to device level makefile. Test: manual (check /sys/module/exynos_drm/parameters/dp_enabled) Bug: 300167292 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d79c602a264f8daf4d0256d834c172f1b26f9a2a) Merged-In: I04be078cc71d54ef0f943578fdefee33cb18332e Change-Id: I04be078cc71d54ef0f943578fdefee33cb18332e --- device-husky.mk | 4 ++++ device-shiba.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index ec26da3..c7e0d53 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -401,3 +401,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true + +# DisplayPort should be disabled by default (b/300167292) +PRODUCT_VENDOR_PROPERTIES += \ + persist.vendor.usb.displayport.enabled=0 diff --git a/device-shiba.mk b/device-shiba.mk index 4753538..1662997 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -376,3 +376,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true + +# DisplayPort should be disabled by default (b/300167292) +PRODUCT_VENDOR_PROPERTIES += \ + persist.vendor.usb.displayport.enabled=0 From 5c500cb5b0dbea47f6f0f96f60f607313815145a Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 10 Oct 2023 22:33:26 +0000 Subject: [PATCH 2/4] Update shiba SVN to 6 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d9e15f1bfcd2059140f81aa5e40440db98aab53e) Merged-In: Id531d288fc06bf7c488799287f5d93dae77bc1f3 Change-Id: Id531d288fc06bf7c488799287f5d93dae77bc1f3 --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 820c1a1..e523ae0 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -333,7 +333,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=5 + ro.vendor.build.svn=6 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From d667847313c54965bcfe3fddfb00377ae8bff4c3 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 10 Oct 2023 22:46:58 +0000 Subject: [PATCH 3/4] Update husky SVN to 6 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e27f637a4edd6fd99a21162ecce847106fecc47) Merged-In: Id8f52d6abb4c83ff3d862347c3100a18b5806d45 Change-Id: Id8f52d6abb4c83ff3d862347c3100a18b5806d45 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 92f889d..7ef9b87 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -352,7 +352,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=5 + ro.vendor.build.svn=6 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From ccea197344fb589d3c7a6dc36a004ceeaaa1147f Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Wed, 1 Nov 2023 07:19:37 +0800 Subject: [PATCH 4/4] gps: set high accuracy shape mode to 1 Only support CP LPP HA GAD shape for TMO Bug: 308489551 Test: CP LPP pass in carrier LAB (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6f2da6ead27e3ea2a8cbee2c5deb942c05141474) Merged-In: I38bce6825ac29b93a6691cee6cca312be3db874e Change-Id: I38bce6825ac29b93a6691cee6cca312be3db874e --- location/gps.xml | 2 +- location/gps.xml.hk3 | 2 +- location/gps.xml.sb3 | 2 +- location/gps_user.xml | 2 +- location/gps_user.xml.hk3 | 2 +- location/gps_user.xml.sb3 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/location/gps.xml b/location/gps.xml index 7a6ce2c..774e206 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -58,7 +58,7 @@ AssertEnabled="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" - CpLppHighAccuracyShapeMode="2" + CpLppHighAccuracyShapeMode="1" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3 index 8ad70f0..2857dcf 100644 --- a/location/gps.xml.hk3 +++ b/location/gps.xml.hk3 @@ -58,7 +58,7 @@ AssertEnabled="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" - CpLppHighAccuracyShapeMode="2" + CpLppHighAccuracyShapeMode="1" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3 index 1c42ca0..bceb407 100644 --- a/location/gps.xml.sb3 +++ b/location/gps.xml.sb3 @@ -58,7 +58,7 @@ AssertEnabled="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" - CpLppHighAccuracyShapeMode="2" + CpLppHighAccuracyShapeMode="1" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" diff --git a/location/gps_user.xml b/location/gps_user.xml index 9d42ff3..9f3bd02 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -57,7 +57,7 @@ AssertEnabled="false" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" - CpLppHighAccuracyShapeMode="2" + CpLppHighAccuracyShapeMode="1" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3 index 94f5955..8a1d2b3 100644 --- a/location/gps_user.xml.hk3 +++ b/location/gps_user.xml.hk3 @@ -57,7 +57,7 @@ AssertEnabled="false" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" - CpLppHighAccuracyShapeMode="2" + CpLppHighAccuracyShapeMode="1" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3 index f19e50f..f74bce6 100644 --- a/location/gps_user.xml.sb3 +++ b/location/gps_user.xml.sb3 @@ -57,7 +57,7 @@ AssertEnabled="false" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" - CpLppHighAccuracyShapeMode="2" + CpLppHighAccuracyShapeMode="1" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true"