From c1440fc558cb27033e966bb44cf4c98cb5ea4322 Mon Sep 17 00:00:00 2001 From: Speth Chang Date: Wed, 19 Apr 2023 06:22:26 +0000 Subject: [PATCH 01/27] Enable P23 multicam framework on bluejay Bug: 275279662 Test: build pass Test: go/p23_multicam_enablement_checklist Change-Id: I7958fda43f90bed917ae7bd0f50705ee2551b855 --- device-bluejay.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 603b33e..eaa0c50 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -77,7 +77,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.camera.extended_launch_boost=1 \ persist.vendor.camera.raise_buf_allocation_priority=1 \ - persist.vendor.camera.fixed_fps_range_boost=1 + persist.vendor.camera.fixed_fps_range_boost=1 \ + vendor.camera.multicam.enable_p23_multicam=true # Display Config PRODUCT_COPY_FILES += \ From 244a7ff5f71d39e55a4ad87927475e8e4f10cf8c Mon Sep 17 00:00:00 2001 From: Speth Chang Date: Mon, 8 May 2023 11:39:45 +0000 Subject: [PATCH 02/27] Remove camera multicam property setup The property was re-named and default enabled. Bug: 281468569 Test: build pass Change-Id: I605ebf535a29548afd1790d38dcdf42bdbf01c6a --- device-bluejay.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 9a5927c..161d807 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -77,8 +77,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.camera.extended_launch_boost=1 \ persist.vendor.camera.raise_buf_allocation_priority=1 \ - persist.vendor.camera.fixed_fps_range_boost=1 \ - vendor.camera.multicam.enable_p23_multicam=true + persist.vendor.camera.fixed_fps_range_boost=1 # Display Config PRODUCT_COPY_FILES += \ From 0fe69606f5915793ba57922ce4daa18390eb207b Mon Sep 17 00:00:00 2001 From: Ziyi Cui Date: Tue, 13 Jun 2023 18:55:56 +0000 Subject: [PATCH 03/27] powerhint: Reduce StaleTimeFactor Reduce StaleTimeFactor for power saving Bug: 269523712 Test: boot and run uibench Change-Id: I7ac26009ff4678de882e43f7fb523c6b5aefe63e Signed-off-by: Ziyi Cui --- powerhint.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/powerhint.json b/powerhint.json index ec48bd8..7898574 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1947,7 +1947,7 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 15.0 }, { "Name": "REFRESH_90FPS", @@ -1971,7 +1971,7 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 15.0 }, { "Name": "REFRESH_60FPS", @@ -1995,7 +1995,7 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 15.0 }, { "Name": "UiHighBoostWithoutPid", From aaeea8dbdfa9113169887bc5351dce08952c805e Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Wed, 7 Sep 2022 15:35:05 +0800 Subject: [PATCH 04/27] powerhint: remove the duplicate thermal powerhint settings For the current design, thermalHAL will only enable one hint base on the current severity and disable the previous one. As a result, the power hint of higher severity should maintain the actions from lower severity which cause the larger config size and maintenance effort. The new thermalHAL design will keep the lower severity's hint enabled, so we could remove the duplicate policies from higher level. Bug: 241737737 Test: verified b3 with emul_temp Change-Id: Ife03b139ad80e1c98f9e6093ac02b8b4f3582656 --- powerhint.json | 264 ------------------------------------------------- 1 file changed, 264 deletions(-) diff --git a/powerhint.json b/powerhint.json index c8291d3..d52ebba 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1541,60 +1541,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "Dex2oatThreads", @@ -1607,162 +1553,12 @@ "Duration": 0, "Value": "0,1,2,3" }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "Dex2oatGroup", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "Dex2oatThreads", - "Duration": 0, - "Value": "4" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "Dex2oatCPUSet", - "Duration": 0, - "Value": "0,1,2,3" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "Dex2oatGroup", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "Dex2oatThreads", "Duration": 0, "Value": "2" }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "Dex2oatCPUSet", - "Duration": 0, - "Value": "0,1,2,3" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "Dex2oatGroup", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_LITTLE_TSKIN_BYPASS", @@ -1781,72 +1577,12 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "Dex2oatThreads", "Duration": 0, "Value": "1" }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "Dex2oatCPUSet", - "Duration": 0, - "Value": "0,1,2,3" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "Dex2oatGroup", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_LITTLE_TSKIN_BYPASS", From 01a67994c5f005ddc741ff88ee23a4937d4407c4 Mon Sep 17 00:00:00 2001 From: Chungkai Mei Date: Thu, 25 May 2023 03:59:46 +0000 Subject: [PATCH 05/27] disable vendor idle balancer Camera is highly optimized in launched devices, so that we disable idle balancer to avoid influencing previous optimization. Bug: 281489720 Change-Id: I210f5c14ec589b06e8d8e80799cf7cb650baa9c5 Signed-off-by: Chungkai Mei --- powerhint.json | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/powerhint.json b/powerhint.json index c8291d3..574958e 100644 --- a/powerhint.json +++ b/powerhint.json @@ -281,6 +281,14 @@ ], "ResetOnInit": true }, + { + "Name": "NewlyIdleBalancer", + "Path": "/proc/vendor_sched/idle_balancer", + "Values": [ + "0", + "1" + ], + }, { "Name": "LimitFlashCurrent", "Path": "vendor.camera.max_flash_current", @@ -982,6 +990,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1078,6 +1092,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -1156,6 +1176,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", @@ -1240,6 +1266,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", From ac330e38bf5b1b1228021dd4f6ec2b1ddccaa99d Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Mon, 26 Jun 2023 01:19:54 +0000 Subject: [PATCH 06/27] Update bluejay SVN to 41 Bug: 285692955 Change-Id: Ia8f9db8eb23134db3eef2c7354da1f7ec3946f51 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index e1615b0..e6e4596 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -122,7 +122,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=40 + ro.vendor.build.svn=41 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From fb0f5bffceaced690714728c6a0cfe8d85ae1d9e Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 30 Jun 2023 02:01:45 +0000 Subject: [PATCH 07/27] Update bluejay SVN to 42 Bug: 289414927 Change-Id: I11e9a8368b21216481ba34fdde427a7ed398acbc --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 789ca9c..0322079 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -123,7 +123,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=41 + ro.vendor.build.svn=42 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 7a6e356a9e79f71e2a01755a163999b5a755061a Mon Sep 17 00:00:00 2001 From: Hawkwood Glazier Date: Wed, 14 Jun 2023 20:06:08 +0000 Subject: [PATCH 08/27] Migrate shared dimens to customziation resources Bug: 282758655 Test: Manually checked layout on many devices Change-Id: Ida248982e5534d1fda6722e6e2009dac5cbe47cc --- .../SystemUI/{ => customization}/res/values-h800dp/dimens.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename bluejay/overlay/frameworks/base/packages/SystemUI/{ => customization}/res/values-h800dp/dimens.xml (100%) diff --git a/bluejay/overlay/frameworks/base/packages/SystemUI/res/values-h800dp/dimens.xml b/bluejay/overlay/frameworks/base/packages/SystemUI/customization/res/values-h800dp/dimens.xml similarity index 100% rename from bluejay/overlay/frameworks/base/packages/SystemUI/res/values-h800dp/dimens.xml rename to bluejay/overlay/frameworks/base/packages/SystemUI/customization/res/values-h800dp/dimens.xml From 89f99fd401149088f72b27ab9fee5dfda5476602 Mon Sep 17 00:00:00 2001 From: Avichal Rakesh Date: Wed, 12 Jul 2023 15:37:01 -0700 Subject: [PATCH 09/27] DeviceAsWebcam: Add overlays for physical camera id Using physical streams reduces power since camera consumes a bulk of the power. Bug: 242346116 Test: Manual webcam use; See power reduction Change-Id: I2157c2ee23301987d80e4cda9da7bdaea3725025 --- bluejay/overlay_packages/DeviceAsWebcam/Android.bp | 10 ++++++++++ .../DeviceAsWebcam/AndroidManifest.xml | 11 +++++++++++ bluejay/overlay_packages/DeviceAsWebcam/OWNERS | 1 + .../res/raw/physical_camera_mapping.json | 1 + device-bluejay.mk | 5 +++++ 5 files changed, 28 insertions(+) create mode 100644 bluejay/overlay_packages/DeviceAsWebcam/Android.bp create mode 100644 bluejay/overlay_packages/DeviceAsWebcam/AndroidManifest.xml create mode 100644 bluejay/overlay_packages/DeviceAsWebcam/OWNERS create mode 100644 bluejay/overlay_packages/DeviceAsWebcam/res/raw/physical_camera_mapping.json diff --git a/bluejay/overlay_packages/DeviceAsWebcam/Android.bp b/bluejay/overlay_packages/DeviceAsWebcam/Android.bp new file mode 100644 index 0000000..b102861 --- /dev/null +++ b/bluejay/overlay_packages/DeviceAsWebcam/Android.bp @@ -0,0 +1,10 @@ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + +runtime_resource_overlay { + name: "DeviceAsWebcamBluejay", + certificate: "platform", + product_specific: true, + sdk_version: "current", +} diff --git a/bluejay/overlay_packages/DeviceAsWebcam/AndroidManifest.xml b/bluejay/overlay_packages/DeviceAsWebcam/AndroidManifest.xml new file mode 100644 index 0000000..5908180 --- /dev/null +++ b/bluejay/overlay_packages/DeviceAsWebcam/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/bluejay/overlay_packages/DeviceAsWebcam/OWNERS b/bluejay/overlay_packages/DeviceAsWebcam/OWNERS new file mode 100644 index 0000000..f48a95c --- /dev/null +++ b/bluejay/overlay_packages/DeviceAsWebcam/OWNERS @@ -0,0 +1 @@ +include platform/frameworks/av:/camera/OWNERS diff --git a/bluejay/overlay_packages/DeviceAsWebcam/res/raw/physical_camera_mapping.json b/bluejay/overlay_packages/DeviceAsWebcam/res/raw/physical_camera_mapping.json new file mode 100644 index 0000000..d847e25 --- /dev/null +++ b/bluejay/overlay_packages/DeviceAsWebcam/res/raw/physical_camera_mapping.json @@ -0,0 +1 @@ +{"0": {"3" : "UW"}} diff --git a/device-bluejay.mk b/device-bluejay.mk index 0322079..92d332a 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -194,6 +194,11 @@ PRODUCT_PACKAGES += \ NoCutoutOverlay \ AvoidAppsInCutoutOverlay + +# Android DeviceAsWebcam specific overlay +PRODUCT_PACKAGES += \ + DeviceAsWebcamBluejay + # SKU specific RROs PRODUCT_PACKAGES += \ SettingsOverlayGB17L \ From ffeb34f7752d891556b0b200d5918d148b980ceb Mon Sep 17 00:00:00 2001 From: Avichal Rakesh Date: Tue, 16 May 2023 13:31:19 -0700 Subject: [PATCH 10/27] Enable UVC support on Bluejay Bluejay now supports UVC gadget function. Setting this flag triggers the framework to surface the UVC specific functionality and UI. Test: Manually tested that the UVC functionality is enabled Bug: 242344221 Change-Id: Ibd1f8e2669a26c6c1e97ba9a4554fe0d41d5421d --- device-bluejay.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index 92d332a..2d15b5b 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -251,3 +251,7 @@ PRODUCT_PRODUCT_PROPERTIES ?= \ # UFS: the script is used to select the corresponding firmware to run FFU. PRODUCT_PACKAGES += ufs_firmware_update.sh + +# Enable DeviceAsWebcam support +PRODUCT_VENDOR_PROPERTIES += \ + ro.usb.uvc.enabled=true From 67c33f4a1893586a9d8047842161c1d4fc2e9237 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Wed, 19 Jul 2023 17:07:41 +0800 Subject: [PATCH 11/27] gps: remove unused sensors Bug: 291538679 Test: Verify driving test and VDR engaged rate doesn't impact Change-Id: I78e9d1e6c7322f0c9e1d29ed3a8656c862995029 --- gps.xml.b3 | 1 + gps_user.xml.b3 | 1 + 2 files changed, 2 insertions(+) diff --git a/gps.xml.b3 b/gps.xml.b3 index 4e55460..62abab8 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -61,6 +61,7 @@ ReAidingOnHotStart="false" ReAidingIntervalSec="1200" PpsDevice="/sys/class/pps/pps0/assert_elapsed" + SensorsMask="0x244" /> Date: Thu, 27 Jul 2023 13:43:01 +0800 Subject: [PATCH 12/27] gps: Disable Vzw SUPL OTDOA Bug: 293213801 Test: OTDOA disabled Change-Id: I048fb789e143e975cfc54765ad220ad9ed248c2e --- gps.xml.b3 | 2 +- gps_user.xml.b3 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gps.xml.b3 b/gps.xml.b3 index 4e55460..35fbb37 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/gps_user.xml.b3 b/gps_user.xml.b3 index 8a96dc9..73043bb 100644 --- a/gps_user.xml.b3 +++ b/gps_user.xml.b3 @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" From 21f4d455ffc60571e424e50e8ffe64668a4e906d Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Thu, 10 Aug 2023 17:39:47 +0000 Subject: [PATCH 13/27] Update bluejay SVN to 43 Bug: 289414927 Change-Id: Iccee70454c4849fa84a84f915be432971af9404b --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 0322079..4a3893c 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -123,7 +123,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=42 + ro.vendor.build.svn=43 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 71b17bb62bf1cdce95b4aff365e5bd667a6cc391 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 11 Aug 2023 19:40:26 +0000 Subject: [PATCH 14/27] Update bluejay SVN to 44 Bug: 289414927 Change-Id: Ie95d32418e5d16a10d3eeab462df857094b730c6 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 4a3893c..c53ac25 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -123,7 +123,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=43 + ro.vendor.build.svn=44 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 3d9216ab4a8f0300de9ceabac0261df69743e3e4 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 11 Aug 2023 21:00:49 +0000 Subject: [PATCH 15/27] Update bluejay SVN to 45 Bug: 289414927 Change-Id: I5e7ecc45c732b5711d076b1e5783355a07c92846 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index c53ac25..dc838ef 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -123,7 +123,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=44 + ro.vendor.build.svn=45 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 257fa8a2d5c12c602bf71e260bc685f2310fdff4 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Tue, 15 Aug 2023 00:10:58 +0000 Subject: [PATCH 16/27] Update bluejay SVN to 46 Bug: 295937899 Change-Id: I77611e1da02e476e85804b24b8dee51dbdefce13 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index dc838ef..dd53985 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -123,7 +123,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=45 + ro.vendor.build.svn=46 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From d0c9858ecd1aedfb240a507a08f85df3cf1332e3 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 16 Aug 2023 05:38:55 +0000 Subject: [PATCH 17/27] Update bluejay SVN to 47 Bug: 295937899 Change-Id: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index dd53985..cfd9364 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -123,7 +123,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=46 + ro.vendor.build.svn=47 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From be12352665a38183e8dfd7dc53d85b087480d1f2 Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Fri, 11 Aug 2023 03:57:06 +0000 Subject: [PATCH 18/27] update the gps conf to the latest version Bug: 290725902 Test: verification test at b/287729267 Change-Id: Ib44465ad69db621f00ad554f490e2320b2653227 --- gps.xml.b3 | 2 ++ gps_user.xml.b3 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/gps.xml.b3 b/gps.xml.b3 index 62abab8..fd85816 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -62,6 +62,7 @@ ReAidingIntervalSec="1200" PpsDevice="/sys/class/pps/pps0/assert_elapsed" SensorsMask="0x244" + MaxThreadNum="13" /> Date: Tue, 29 Aug 2023 15:14:10 +0800 Subject: [PATCH 19/27] gps: enable always-on measurements log Bug: 286158090 Test: verify pass in b/286158090#comment53 Change-Id: I1033c8b31474a8a9ee191730f67d4e27b69532e1 --- gps.xml.b3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gps.xml.b3 b/gps.xml.b3 index eca324a..6e739e7 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -68,7 +68,7 @@ Date: Thu, 7 Sep 2023 02:41:55 +0000 Subject: [PATCH 20/27] Update bluejay SVN to 48 Bug: 298087649 Change-Id: I18efad473df907d05dd61dd3ad4c28f3a6c2d463 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index cfd9364..f68ef20 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -123,7 +123,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=47 + ro.vendor.build.svn=48 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From b2ee8ab0f52d03b3e7e6a90f4d6400a117e9c830 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 7 Sep 2023 23:29:12 +0000 Subject: [PATCH 21/27] Update bluejay SVN to 49 Bug: 298087649 Change-Id: I36c2925303fecddc613d25e34faaada5d5ed4485 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index f68ef20..f32e8f9 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -123,7 +123,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=48 + ro.vendor.build.svn=49 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From c1f4f50bd0c8524a91dfaf563361826520e91c6d Mon Sep 17 00:00:00 2001 From: Jayant Chowdhary Date: Tue, 12 Sep 2023 23:34:32 +0000 Subject: [PATCH 22/27] Revert "DeviceAsWebcam: Add overlays for physical camera id" This reverts commit 89f99fd401149088f72b27ab9fee5dfda5476602. Reason for revert: With stream use case VIDEO_CALL + logical stream power is well within the permissible limit of 3W. Bug: 300166920 Change-Id: I2d764fdf2dc3124d3f60513c5e76108b52ed8f7b --- bluejay/overlay_packages/DeviceAsWebcam/Android.bp | 10 ---------- .../DeviceAsWebcam/AndroidManifest.xml | 11 ----------- bluejay/overlay_packages/DeviceAsWebcam/OWNERS | 1 - .../res/raw/physical_camera_mapping.json | 1 - device-bluejay.mk | 5 ----- 5 files changed, 28 deletions(-) delete mode 100644 bluejay/overlay_packages/DeviceAsWebcam/Android.bp delete mode 100644 bluejay/overlay_packages/DeviceAsWebcam/AndroidManifest.xml delete mode 100644 bluejay/overlay_packages/DeviceAsWebcam/OWNERS delete mode 100644 bluejay/overlay_packages/DeviceAsWebcam/res/raw/physical_camera_mapping.json diff --git a/bluejay/overlay_packages/DeviceAsWebcam/Android.bp b/bluejay/overlay_packages/DeviceAsWebcam/Android.bp deleted file mode 100644 index b102861..0000000 --- a/bluejay/overlay_packages/DeviceAsWebcam/Android.bp +++ /dev/null @@ -1,10 +0,0 @@ -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - -runtime_resource_overlay { - name: "DeviceAsWebcamBluejay", - certificate: "platform", - product_specific: true, - sdk_version: "current", -} diff --git a/bluejay/overlay_packages/DeviceAsWebcam/AndroidManifest.xml b/bluejay/overlay_packages/DeviceAsWebcam/AndroidManifest.xml deleted file mode 100644 index 5908180..0000000 --- a/bluejay/overlay_packages/DeviceAsWebcam/AndroidManifest.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/bluejay/overlay_packages/DeviceAsWebcam/OWNERS b/bluejay/overlay_packages/DeviceAsWebcam/OWNERS deleted file mode 100644 index f48a95c..0000000 --- a/bluejay/overlay_packages/DeviceAsWebcam/OWNERS +++ /dev/null @@ -1 +0,0 @@ -include platform/frameworks/av:/camera/OWNERS diff --git a/bluejay/overlay_packages/DeviceAsWebcam/res/raw/physical_camera_mapping.json b/bluejay/overlay_packages/DeviceAsWebcam/res/raw/physical_camera_mapping.json deleted file mode 100644 index d847e25..0000000 --- a/bluejay/overlay_packages/DeviceAsWebcam/res/raw/physical_camera_mapping.json +++ /dev/null @@ -1 +0,0 @@ -{"0": {"3" : "UW"}} diff --git a/device-bluejay.mk b/device-bluejay.mk index 92d332a..0322079 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -194,11 +194,6 @@ PRODUCT_PACKAGES += \ NoCutoutOverlay \ AvoidAppsInCutoutOverlay - -# Android DeviceAsWebcam specific overlay -PRODUCT_PACKAGES += \ - DeviceAsWebcamBluejay - # SKU specific RROs PRODUCT_PACKAGES += \ SettingsOverlayGB17L \ From dba182188efd2eb78f69aac3c017f8b2e30d983c Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Tue, 19 Sep 2023 03:04:17 +0000 Subject: [PATCH 23/27] Disable limiting camera_hal for LAUNCH hint If auto rotation is enabled, it will trigger LAUNCH hint while camera is running if device rotates, which could limit camera_hal tasks to little cores. So, disable it first until there is a new hint for the rotation event. Bug: 297273578 Test: build pass Change-Id: Ib92bb1ee5833924a1e34b8c91e15f6cb26a0e645 --- powerhint.json | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/powerhint.json b/powerhint.json index 9942292..90063f3 100644 --- a/powerhint.json +++ b/powerhint.json @@ -600,30 +600,6 @@ "Type": "DoHint", "Value": "LAUNCH_EXTEND" }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", From fa7a219cb4a5147363ad3a4f5e397bd7919e9820 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:13:58 +0000 Subject: [PATCH 24/27] Update bluejay SVN to 50 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9b309d763af958632045184fe493b6ed1d1510c2) Merged-In: I7393253ef50c9b1da0f683ffcdd9cd191c8ab1f6 Change-Id: I7393253ef50c9b1da0f683ffcdd9cd191c8ab1f6 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 29c86fa..545272b 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -123,7 +123,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=49 + ro.vendor.build.svn=50 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From be5320326187f5c905d71e32a42dea040ea40a98 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:32 +0000 Subject: [PATCH 25/27] Update bluejay SVN to 51 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d81b0b63f1806dbd9353d266dc0bab6a3e0549fd) Merged-In: If8f16626a5e13f98e81ff0833a60888efe9cddcd Change-Id: If8f16626a5e13f98e81ff0833a60888efe9cddcd --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 545272b..fac3875 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -123,7 +123,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=50 + ro.vendor.build.svn=51 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From ad5bdd72ff245dc5f5ae0a2a8068ebdd07ce21e5 Mon Sep 17 00:00:00 2001 From: Shivakumar Neginal Date: Mon, 16 Oct 2023 20:21:31 +0000 Subject: [PATCH 26/27] Adding Fast Pair extended IDs for Pixel 6a Adding the Fast Pair extended IDs for bluejay so that Quick Start shows the right Fast Pair bottom sheet on other devices during setup. Bug: 305516133 Test: TBD (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:648307e16fe999eec1c83ab2df5bfa6364076216) Merged-In: I852842706664902dc3a76175810ebf869439796d Change-Id: I852842706664902dc3a76175810ebf869439796d --- device-bluejay.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index fac3875..8a244e3 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -250,3 +250,8 @@ PRODUCT_PACKAGES += ufs_firmware_update.sh # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true + +# Quick Start device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + ro.quick_start.oem_id=00e0 \ + ro.quick_start.device_id=bluejay From 3a56f8bf7a8942dd0fa1acd69286da24793b1e69 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 26 Oct 2023 05:11:04 +0000 Subject: [PATCH 27/27] Update bluejay SVN to 52 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8f9b6dbaaa8e78c8ded400d19d2f7d89fdaf2fd8) Merged-In: I403e87cf5943f5c45d6d0db99a3e15018064067a Change-Id: I403e87cf5943f5c45d6d0db99a3e15018064067a --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 8a244e3..a95e7b8 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -123,7 +123,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=51 + ro.vendor.build.svn=52 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \