From 154b91db92e0e69b276e25c3df6766526b719f02 Mon Sep 17 00:00:00 2001 From: Speth Chang Date: Wed, 19 Apr 2023 05:42:03 +0000 Subject: [PATCH 01/47] Enable P23 multicam framework on raviole Bug: 275279662 Test: build pass Test: go/p23_multicam_enablement_checklist Change-Id: I7958fda43f90bed917ae7bd0f50705ee2551b855 --- device-oriole.mk | 3 ++- device-raven.mk | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 8c19639..db29ea2 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -114,7 +114,8 @@ PRODUCT_COPY_FILES += \ device/google/raviole/media_profiles_oriole.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml PRODUCT_PROPERTY_OVERRIDES += \ - 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 += \ diff --git a/device-raven.mk b/device-raven.mk index a3067f7..b451b0a 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -240,6 +240,9 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true +PRODUCT_PROPERTY_OVERRIDES += \ + vendor.camera.multicam.enable_p23_multicam=true + # tetheroffload HAL PRODUCT_PACKAGES += \ vendor.samsung_slsi.hardware.tetheroffload@1.1-service From b90435068d598f178051e88b5a958db07cd79011 Mon Sep 17 00:00:00 2001 From: Speth Chang Date: Mon, 8 May 2023 11:27:31 +0000 Subject: [PATCH 02/47] Remove camera multicam property setup The property was re-named and default enabled. Bug: 281468569 Test: build pass Change-Id: I70632565cc9d6514d70eb3754510c6b3ce15ee8f --- device-oriole.mk | 3 +-- device-raven.mk | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 47de829..f01655c 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -114,8 +114,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/media_profiles_oriole.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml PRODUCT_PROPERTY_OVERRIDES += \ - 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 += \ diff --git a/device-raven.mk b/device-raven.mk index 6de904f..a926be3 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -240,9 +240,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true -PRODUCT_PROPERTY_OVERRIDES += \ - vendor.camera.multicam.enable_p23_multicam=true - # tetheroffload HAL PRODUCT_PACKAGES += \ vendor.samsung_slsi.hardware.tetheroffload@1.1-service From 9e53e0ec95154d5ed6bfd04b72ff2bf5d7a2deb3 Mon Sep 17 00:00:00 2001 From: Jiaming Liu Date: Fri, 12 May 2023 01:36:04 +0000 Subject: [PATCH 03/47] Revert "Disable WM Extensions on Pixel 6" This reverts commit e81ae9f5e14ae9f3d87ac9bfa2456d69edf86d92. Reason for revert: Re-enable for U QPR Bug: 266196089 Change-Id: I9fdca6644ee7302f52fe3b850a357bae76dbacf3 --- device-oriole.mk | 8 ++++++++ device-raven.mk | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index e7d8fd7..f01655c 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -271,3 +271,11 @@ else PRODUCT_COPY_FILES += \ device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif + +# Window Extensions +$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) + +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.settings.large_screen_opt.enabled=false + diff --git a/device-raven.mk b/device-raven.mk index fffcbfc..a926be3 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -290,3 +290,11 @@ else PRODUCT_COPY_FILES += \ device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif + +# Window Extensions +$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) + +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.settings.large_screen_opt.enabled=false + From 891f54c554b94ef22c6cebb2bec138ad36b68667 Mon Sep 17 00:00:00 2001 From: Andrew Chant Date: Tue, 30 May 2023 14:43:13 -0700 Subject: [PATCH 04/47] raviole: update power_limit.csv paths Update power_limit csv paths, LOCAL_PATH was not correct. Bug: 277993984 Change-Id: Ifd2a61c0d8327491582d5d3729b4fa2b3689cec0 --- device-oriole.mk | 12 ++++++------ device-raven.mk | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index c5b1b0e..3508a04 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -77,12 +77,12 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetooth Tx power caps for oriole PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/bluetooth_power_limits_oriole.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ - $(LOCAL_PATH)/bluetooth_power_limits_oriole_jp.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \ - $(LOCAL_PATH)/bluetooth_power_limits_G9S9B_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G9S9B_US.csv \ - $(LOCAL_PATH)/bluetooth_power_limits_GB7N6_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB7N6_US.csv \ - $(LOCAL_PATH)/bluetooth_power_limits_G9S9B_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G9S9B_EU.csv \ - $(LOCAL_PATH)/bluetooth_power_limits_GB7N6_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB7N6_EU.csv + device/google/raviole/bluetooth_power_limits_oriole.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ + device/google/raviole/bluetooth_power_limits_oriole_jp.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \ + device/google/raviole/bluetooth_power_limits_G9S9B_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G9S9B_US.csv \ + device/google/raviole/bluetooth_power_limits_GB7N6_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB7N6_US.csv \ + device/google/raviole/bluetooth_power_limits_G9S9B_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G9S9B_EU.csv \ + device/google/raviole/bluetooth_power_limits_GB7N6_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB7N6_EU.csv # Bluetooth Hal Extension test tools diff --git a/device-raven.mk b/device-raven.mk index cffa228..afa6bda 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -88,10 +88,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetooth Tx power caps for raven PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/bluetooth_power_limits_raven.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ - $(LOCAL_PATH)/bluetooth_power_limits_raven_us.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv \ - $(LOCAL_PATH)/bluetooth_power_limits_raven_eu.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \ - $(LOCAL_PATH)/bluetooth_power_limits_raven_jp.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv + device/google/raviole/bluetooth_power_limits_raven.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ + device/google/raviole/bluetooth_power_limits_raven_us.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv \ + device/google/raviole/bluetooth_power_limits_raven_eu.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \ + device/google/raviole/bluetooth_power_limits_raven_jp.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv # Bluetooth HAL PRODUCT_COPY_FILES += \ From e3669c9af91a57531c8805e8b602c836c308a33a Mon Sep 17 00:00:00 2001 From: Jayant Chowdhary Date: Thu, 25 May 2023 20:16:27 +0000 Subject: [PATCH 05/47] 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: Ibfc0698f410c90049f77f0a071b8b4999fb1cfdd Signed-off-by: Jayant Chowdhary --- device-oriole.mk | 4 ++++ device-raven.mk | 4 ++++ .../overlay_packages/DeviceAsWebcamOriole/Android.bp | 10 ++++++++++ .../DeviceAsWebcamOriole/AndroidManifest.xml | 10 ++++++++++ oriole/overlay_packages/DeviceAsWebcamOriole/OWNERS | 1 + .../res/raw/physical_camera_mapping.json | 1 + raven/overlay_packages/DeviceAsWebcamRaven/Android.bp | 10 ++++++++++ .../DeviceAsWebcamRaven/AndroidManifest.xml | 10 ++++++++++ raven/overlay_packages/DeviceAsWebcamRaven/OWNERS | 1 + .../res/raw/physical_camera_mapping.json | 1 + 10 files changed, 52 insertions(+) create mode 100644 oriole/overlay_packages/DeviceAsWebcamOriole/Android.bp create mode 100644 oriole/overlay_packages/DeviceAsWebcamOriole/AndroidManifest.xml create mode 100644 oriole/overlay_packages/DeviceAsWebcamOriole/OWNERS create mode 100644 oriole/overlay_packages/DeviceAsWebcamOriole/res/raw/physical_camera_mapping.json create mode 100644 raven/overlay_packages/DeviceAsWebcamRaven/Android.bp create mode 100644 raven/overlay_packages/DeviceAsWebcamRaven/AndroidManifest.xml create mode 100644 raven/overlay_packages/DeviceAsWebcamRaven/OWNERS create mode 100644 raven/overlay_packages/DeviceAsWebcamRaven/res/raw/physical_camera_mapping.json diff --git a/device-oriole.mk b/device-oriole.mk index d3800b1..d9dff81 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -193,6 +193,10 @@ PRODUCT_PACKAGES += \ NoCutoutOverlay \ AvoidAppsInCutoutOverlay +# Android DeviceAsWebcam specific overlay +PRODUCT_PACKAGES += \ + DeviceAsWebcamOriole + # SKU specific RROs PRODUCT_PACKAGES += \ SettingsOverlayGR1YH \ diff --git a/device-raven.mk b/device-raven.mk index cf5bb71..2afddb6 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -205,6 +205,10 @@ PRODUCT_PACKAGES += \ NoCutoutOverlay \ AvoidAppsInCutoutOverlay +# Android DeviceAsWebcam specific overlay +PRODUCT_PACKAGES += \ + DeviceAsWebcamRaven + # Fingerprint antispoof property PRODUCT_PRODUCT_PROPERTIES +=\ persist.vendor.fingerprint.disable.fake.override=none diff --git a/oriole/overlay_packages/DeviceAsWebcamOriole/Android.bp b/oriole/overlay_packages/DeviceAsWebcamOriole/Android.bp new file mode 100644 index 0000000..158e2b8 --- /dev/null +++ b/oriole/overlay_packages/DeviceAsWebcamOriole/Android.bp @@ -0,0 +1,10 @@ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + +runtime_resource_overlay { + name: "DeviceAsWebcamOriole", + certificate: "platform", + product_specific: true, + sdk_version: "current", +} diff --git a/oriole/overlay_packages/DeviceAsWebcamOriole/AndroidManifest.xml b/oriole/overlay_packages/DeviceAsWebcamOriole/AndroidManifest.xml new file mode 100644 index 0000000..cc7d3ba --- /dev/null +++ b/oriole/overlay_packages/DeviceAsWebcamOriole/AndroidManifest.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/oriole/overlay_packages/DeviceAsWebcamOriole/OWNERS b/oriole/overlay_packages/DeviceAsWebcamOriole/OWNERS new file mode 100644 index 0000000..d22af85 --- /dev/null +++ b/oriole/overlay_packages/DeviceAsWebcamOriole/OWNERS @@ -0,0 +1 @@ +include platform/frameworks/av:/camera/OWNERS \ No newline at end of file diff --git a/oriole/overlay_packages/DeviceAsWebcamOriole/res/raw/physical_camera_mapping.json b/oriole/overlay_packages/DeviceAsWebcamOriole/res/raw/physical_camera_mapping.json new file mode 100644 index 0000000..4dd9988 --- /dev/null +++ b/oriole/overlay_packages/DeviceAsWebcamOriole/res/raw/physical_camera_mapping.json @@ -0,0 +1 @@ +{"0": {"3" : "UW"}} \ No newline at end of file diff --git a/raven/overlay_packages/DeviceAsWebcamRaven/Android.bp b/raven/overlay_packages/DeviceAsWebcamRaven/Android.bp new file mode 100644 index 0000000..9a0527d --- /dev/null +++ b/raven/overlay_packages/DeviceAsWebcamRaven/Android.bp @@ -0,0 +1,10 @@ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + +runtime_resource_overlay { + name: "DeviceAsWebcamRaven", + certificate: "platform", + product_specific: true, + sdk_version: "current", +} diff --git a/raven/overlay_packages/DeviceAsWebcamRaven/AndroidManifest.xml b/raven/overlay_packages/DeviceAsWebcamRaven/AndroidManifest.xml new file mode 100644 index 0000000..cc7d3ba --- /dev/null +++ b/raven/overlay_packages/DeviceAsWebcamRaven/AndroidManifest.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/raven/overlay_packages/DeviceAsWebcamRaven/OWNERS b/raven/overlay_packages/DeviceAsWebcamRaven/OWNERS new file mode 100644 index 0000000..d22af85 --- /dev/null +++ b/raven/overlay_packages/DeviceAsWebcamRaven/OWNERS @@ -0,0 +1 @@ +include platform/frameworks/av:/camera/OWNERS \ No newline at end of file diff --git a/raven/overlay_packages/DeviceAsWebcamRaven/res/raw/physical_camera_mapping.json b/raven/overlay_packages/DeviceAsWebcamRaven/res/raw/physical_camera_mapping.json new file mode 100644 index 0000000..4dd9988 --- /dev/null +++ b/raven/overlay_packages/DeviceAsWebcamRaven/res/raw/physical_camera_mapping.json @@ -0,0 +1 @@ +{"0": {"3" : "UW"}} \ No newline at end of file From 26bbdd1d56687b80a0c360a07e95be3d6fdcc145 Mon Sep 17 00:00:00 2001 From: Ted Wang Date: Thu, 8 Jun 2023 13:45:23 +0000 Subject: [PATCH 06/47] Include device sepolicy Bug: 286371097 Test: make Change-Id: I27a4e0fb180948f095dafcde5a2553b305603e2a --- oriole/BoardConfig.mk | 1 + raven/BoardConfig.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index e3d7efc..c428a83 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -38,6 +38,7 @@ USES_DEVICE_GOOGLE_RAVIOLE := true BOARD_KERNEL_CMDLINE += disable_dma32=on include device/google/gs101/BoardConfig-common.mk +include device/google/gs101-sepolicy/oriole-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk -include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 2217df1..462133a 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -38,6 +38,7 @@ USES_DEVICE_GOOGLE_RAVIOLE := true BOARD_KERNEL_CMDLINE += disable_dma32=on include device/google/gs101/BoardConfig-common.mk +include device/google/gs101-sepolicy/raven-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk -include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk From caf51ee5b6b1c25f0850ca3d04cef33854b1b723 Mon Sep 17 00:00:00 2001 From: Ziyi Cui Date: Tue, 13 Jun 2023 18:00:42 +0000 Subject: [PATCH 07/47] powerhint: Reduce StaleTimeFactor Reduce StaleTimeFactor for power saving Bug: 269523712 Test: boot and run uibench Change-Id: I347a2e3c24fe6ad3a81edca32b44abd83008adf9 Signed-off-by: Ziyi Cui --- powerhint-oriole.json | 6 +++--- powerhint-raven.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index b8f0a52..cf33119 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -1860,7 +1860,7 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 15.0 }, { "Name": "REFRESH_90FPS", @@ -1884,7 +1884,7 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 15.0 }, { "Name": "REFRESH_60FPS", @@ -1908,7 +1908,7 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 15.0 }, { "Name": "UiHighBoostWithoutPid", diff --git a/powerhint-raven.json b/powerhint-raven.json index b71165f..483ef8d 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -1841,7 +1841,7 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 15.0 }, { "Name": "REFRESH_90FPS", @@ -1865,7 +1865,7 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 15.0 }, { "Name": "REFRESH_60FPS", @@ -1889,7 +1889,7 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 15.0 }, { "Name": "UiHighBoostWithoutPid", From d552119737ca69ee682de816b025428bd1910f87 Mon Sep 17 00:00:00 2001 From: Avichal Rakesh Date: Mon, 6 Feb 2023 13:32:35 -0800 Subject: [PATCH 08/47] Enable UVC support on raviole Raven and Oriole 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: I979a2d8f5a3d35bc8dffac87e2e9e29c1a03043a --- device-oriole.mk | 3 +++ device-raven.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index d9dff81..bdfa515 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -284,3 +284,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) PRODUCT_SYSTEM_PROPERTIES += \ persist.settings.large_screen_opt.enabled=false +# Enable DeviceAsWebcam support +PRODUCT_VENDOR_PROPERTIES += \ + ro.usb.uvc.enabled=true diff --git a/device-raven.mk b/device-raven.mk index 2afddb6..16129fc 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -303,3 +303,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) PRODUCT_SYSTEM_PROPERTIES += \ persist.settings.large_screen_opt.enabled=false +# Enable DeviceAsWebcam support +PRODUCT_VENDOR_PROPERTIES += \ + ro.usb.uvc.enabled=true From 87fb539007e07e853a80e4ef4a498068096ce074 Mon Sep 17 00:00:00 2001 From: Hasan Awais Date: Wed, 21 Jun 2023 16:52:05 +0000 Subject: [PATCH 09/47] uwb: update calibration for range bias Bug: 287082706 Test: build pass Change-Id: Icc7ed7860b6c5e31486ad09b91a9ae0344c5b5d4 Signed-off-by: Hasan Awais --- uwb/UWB-calibration-ce.conf | 6 +++--- uwb/UWB-calibration-default.conf | 6 +++--- uwb/UWB-calibration-fcc.conf | 6 +++--- uwb/UWB-calibration-jp.conf | 6 +++--- uwb/UWB-calibration-restricted.conf | 6 +++--- uwb/UWB-calibration-tw.conf | 6 +++--- uwb/UWB-calibration.conf | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf index 8514ffa..569b0a9 100644 --- a/uwb/UWB-calibration-ce.conf +++ b/uwb/UWB-calibration-ce.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x4B4B234B ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0x4B4B234B ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x53532B53 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x53532B53 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x34 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf index 7f02b49..0e5b153 100644 --- a/uwb/UWB-calibration-default.conf +++ b/uwb/UWB-calibration-default.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x47472347 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0x47472347 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x47472347 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x47472347 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x34 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf index 7f02b49..0e5b153 100644 --- a/uwb/UWB-calibration-fcc.conf +++ b/uwb/UWB-calibration-fcc.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x47472347 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0x47472347 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x47472347 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x47472347 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x34 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf index 6eba206..550519d 100644 --- a/uwb/UWB-calibration-jp.conf +++ b/uwb/UWB-calibration-jp.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x2A2A2A2A ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x20 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x2A2A2A2A ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x20 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf index f492db3..46aba9a 100644 --- a/uwb/UWB-calibration-restricted.conf +++ b/uwb/UWB-calibration-restricted.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x47472347 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0x47472347 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x47472347 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x47472347 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x34 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf index c709cec..a5e88b1 100644 --- a/uwb/UWB-calibration-tw.conf +++ b/uwb/UWB-calibration-tw.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x47472347 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0x47472347 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x47472347 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x47472347 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x34 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf index 5972577..b4047cd 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x47472347 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0x47472347 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x2A2A2A2A ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x20 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x2A2A2A2A ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x20 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 From 96e7f36feb7e5f14894b06adb9c930a7994c24e7 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Mon, 26 Jun 2023 01:16:41 +0000 Subject: [PATCH 10/47] Update raviole SVN to 62 Bug: 285692955 Change-Id: I844fd9fe96b066891d999977e213409bec1ab378 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 2c33ab4..2767041 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -171,7 +171,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=61 + ro.vendor.build.svn=62 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-raven.mk b/device-raven.mk index cc20373..afbc33f 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -180,7 +180,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=61 + ro.vendor.build.svn=62 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From d0a4d1b6d7430c46bd2c56918cad224ef452893f Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Wed, 7 Sep 2022 15:29:58 +0800 Subject: [PATCH 11/47] 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 Raven with emul_temp Change-Id: I51bf72997e0d85baa419e890453838f882b64f50 --- powerhint-oriole.json | 264 ------------------------------------------ powerhint-raven.json | 264 ------------------------------------------ 2 files changed, 528 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 41de22a..1eeb205 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -1448,60 +1448,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", @@ -1514,162 +1460,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_SEVERE", - "Node": "Dex2oatGroup", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { - "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", @@ -1688,72 +1484,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", diff --git a/powerhint-raven.json b/powerhint-raven.json index 82fc9f4..59faed3 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -1429,60 +1429,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", @@ -1495,162 +1441,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_SEVERE", - "Node": "Dex2oatGroup", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { - "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", @@ -1669,72 +1465,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 adafd7172e9ecc0506a3b7ad05633e9896a08d2c Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Thu, 29 Jun 2023 20:56:22 +0000 Subject: [PATCH 12/47] Update oriole SVN to 63 Bug: 289414927 Change-Id: I3b1c01cf8262a7a83ed57c2ee01ae632889b8a6f --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 915b748..d8f40b2 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=62 + ro.vendor.build.svn=63 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 1b2ac29db3d6bde4fba7493337fa63e1fdebe98c Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Thu, 29 Jun 2023 20:56:42 +0000 Subject: [PATCH 13/47] Update raven SVN to 63 Bug: 289414927 Change-Id: Ib25450b4fe20540b7be29b24a4f7e8ac2918afed --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 243929c..fd3e9ed 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=62 + ro.vendor.build.svn=63 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From f56bbd1bfbbaceb8efab6c6b6a4ff64f21d6ffa7 Mon Sep 17 00:00:00 2001 From: Chungkai Mei Date: Tue, 13 Jun 2023 08:37:51 +0000 Subject: [PATCH 14/47] 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-oriole.json | 32 ++++++++++++++++++++++++++++++++ powerhint-raven.json | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 1eeb205..c101230 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -278,6 +278,14 @@ ], "ResetOnInit": true }, + { + "Name": "NewlyIdleBalancer", + "Path": "/proc/vendor_sched/idle_balancer", + "Values": [ + "0", + "1" + ], + }, { "Name": "LimitFlashCurrent", "Path": "vendor.camera.max_flash_current", @@ -955,6 +963,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1027,6 +1041,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -1081,6 +1101,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", @@ -1141,6 +1167,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", diff --git a/powerhint-raven.json b/powerhint-raven.json index 59faed3..81e01c0 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -277,6 +277,14 @@ ], "ResetOnInit": true }, + { + "Name": "NewlyIdleBalancer", + "Path": "/proc/vendor_sched/idle_balancer", + "Values": [ + "0", + "1" + ], + }, { "Name": "LimitFlashCurrent", "Path": "vendor.camera.max_flash_current", @@ -954,6 +962,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1026,6 +1040,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -1080,6 +1100,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", @@ -1140,6 +1166,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", From c38f28d0fa070232d7cbec7dc794c0bd377c2c40 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Wed, 19 Jul 2023 17:04:37 +0800 Subject: [PATCH 15/47] gps: remove unused sensors Bug: 291538679 Test: Verify driving test and VDR engaged rate doesn't impact Change-Id: Icbaa53b8ccad29ad157feabd7fb5593f5b6ac40d --- location/gps.xml | 1 + location/gps.xml.oriole | 1 + location/gps.xml.raven | 1 + location/gps_user.xml | 1 + location/gps_user.xml.oriole | 1 + location/gps_user.xml.raven | 1 + 6 files changed, 6 insertions(+) diff --git a/location/gps.xml b/location/gps.xml index 7c53415..9e4d06a 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -61,6 +61,7 @@ ReAidingOnHotStart="false" ReAidingIntervalSec="1200" PpsDevice="/sys/class/pps/pps0/assert_elapsed" + SensorsMask="0x244" /> Date: Mon, 22 May 2023 19:56:37 +0000 Subject: [PATCH 16/47] Removing faceauth configs Bug: 268705900 Test: target build Change-Id: Ie9f7f7b928037e0125b959505db34e609affa932 --- conf/init.raven.rc | 4 ---- raven/overlay/frameworks/base/core/res/res/values/config.xml | 3 --- 2 files changed, 7 deletions(-) diff --git a/conf/init.raven.rc b/conf/init.raven.rc index 5153c58..4d35ee1 100644 --- a/conf/init.raven.rc +++ b/conf/init.raven.rc @@ -11,10 +11,6 @@ on init # Power Stats HAL chown system system /sys/devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power_stats -on fs - # Face - exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/faceauth.app - on property:vendor.mfgapi.touchpanel.permission=1 chmod 0600 /sys/devices/virtual/sec/tsp/cmd chown system system /sys/devices/virtual/sec/tsp/cmd diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index c8d8730..4c636d8 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -197,9 +197,6 @@ 145px 28dp - - false - 2 3 From 896aa10a3f25fc3bc81f1f4dd0256105ca13761d Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Thu, 10 Aug 2023 17:39:35 +0000 Subject: [PATCH 17/47] Update raven SVN to 64 Bug: 289414927 Change-Id: I810a986d63c1290e982a818d8c3333ec154f132f --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index fd3e9ed..8e751cb 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=63 + ro.vendor.build.svn=64 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 75fc391675423c6c536ed9f7f3a609ba277ba0d5 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Thu, 10 Aug 2023 17:39:18 +0000 Subject: [PATCH 18/47] Update oriole SVN to 64 Bug: 289414927 Change-Id: I3d4b6b88f7f11c09cf6b3b0a44e58b71512b670f --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index d8f40b2..0851fae 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=63 + ro.vendor.build.svn=64 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 4f2338232d71451bcf11d061cc81a06fdc42dccf Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 11 Aug 2023 19:40:13 +0000 Subject: [PATCH 19/47] Update raven SVN to 65 Bug: 289414927 Change-Id: I93ad1006560c9d24ddd05cf84a296fb45c55ca36 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 8e751cb..ca8b29e 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=64 + ro.vendor.build.svn=65 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 1cb7eab005ed824768a5d5cf2a64d131e8ca421f Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 11 Aug 2023 19:39:51 +0000 Subject: [PATCH 20/47] Update oriole SVN to 65 Bug: 289414927 Change-Id: Ie153885b359f046a62b0504de6370c977be0c660 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 0851fae..d84bd18 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=64 + ro.vendor.build.svn=65 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 51a53388f65718adf04c966e6d198806e6ee7c16 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 11 Aug 2023 21:00:28 +0000 Subject: [PATCH 21/47] Update oriole SVN to 66 Bug: 289414927 Change-Id: I3d98813e9b236d583bc1bedeca1d5d0b26485c38 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index d84bd18..d539149 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=65 + ro.vendor.build.svn=66 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 45ec5947addac69fe8107de50f73bddd4e9812c4 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 11 Aug 2023 21:00:40 +0000 Subject: [PATCH 22/47] Update raven SVN to 66 Bug: 289414927 Change-Id: I49b714ba9f9d0e6d4f7fbe17e3a21f0b5a9e41d1 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index ca8b29e..1bee402 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=65 + ro.vendor.build.svn=66 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 0446d9c258a87a3ea3edf5f9953336910dca10fb Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Mon, 14 Aug 2023 22:11:01 +0000 Subject: [PATCH 23/47] Revert "Removing faceauth configs" Revert submission 24039435-cherrypick-FaceHAL-deprecate-raven-yon2bm08mmg Reason for revert: Droidfood blocking bug b/295449925 Reverted changes: /q/submissionid:24039435-cherrypick-FaceHAL-deprecate-raven-yon2bm08mmg (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:91934a32db19ea060453b610e47c493459e70d33) Merged-In: Iabd85576568ce66718e625607aa0d31dc8b357cc Change-Id: Iabd85576568ce66718e625607aa0d31dc8b357cc --- conf/init.raven.rc | 4 ++++ raven/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 2 files changed, 7 insertions(+) diff --git a/conf/init.raven.rc b/conf/init.raven.rc index 4d35ee1..5153c58 100644 --- a/conf/init.raven.rc +++ b/conf/init.raven.rc @@ -11,6 +11,10 @@ on init # Power Stats HAL chown system system /sys/devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power_stats +on fs + # Face + exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/faceauth.app + on property:vendor.mfgapi.touchpanel.permission=1 chmod 0600 /sys/devices/virtual/sec/tsp/cmd chown system system /sys/devices/virtual/sec/tsp/cmd diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index 4c636d8..c8d8730 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -197,6 +197,9 @@ 145px 28dp + + false + 2 3 From d3a7ba8ef0ea1b082bb8fad963b04f5d74f6e721 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Tue, 15 Aug 2023 00:10:31 +0000 Subject: [PATCH 24/47] Update oriole SVN to 67 Bug: 295937899 Change-Id: I9f4ee890043fd750b1ce98057194214a15d90a70 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index d539149..2184715 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=66 + ro.vendor.build.svn=67 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 9ba93d0cedeca37b2fe2e8e3271c6d0f4837492f Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Mon, 14 Aug 2023 22:11:01 +0000 Subject: [PATCH 25/47] Revert "Removing faceauth configs" Revert submission 24039435-cherrypick-FaceHAL-deprecate-raven-yon2bm08mmg Reason for revert: Droidfood blocking bug b/295449925 Reverted changes: /q/submissionid:24039435-cherrypick-FaceHAL-deprecate-raven-yon2bm08mmg (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:91934a32db19ea060453b610e47c493459e70d33) Merged-In: Iabd85576568ce66718e625607aa0d31dc8b357cc Change-Id: Iabd85576568ce66718e625607aa0d31dc8b357cc --- conf/init.raven.rc | 4 ++++ raven/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 2 files changed, 7 insertions(+) diff --git a/conf/init.raven.rc b/conf/init.raven.rc index 4d35ee1..5153c58 100644 --- a/conf/init.raven.rc +++ b/conf/init.raven.rc @@ -11,6 +11,10 @@ on init # Power Stats HAL chown system system /sys/devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power_stats +on fs + # Face + exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/faceauth.app + on property:vendor.mfgapi.touchpanel.permission=1 chmod 0600 /sys/devices/virtual/sec/tsp/cmd chown system system /sys/devices/virtual/sec/tsp/cmd diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index 4c636d8..c8d8730 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -197,6 +197,9 @@ 145px 28dp + + false + 2 3 From cd4d49a6371af837a3c4557a745e04cf63e9979b Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Mon, 14 Aug 2023 22:11:01 +0000 Subject: [PATCH 26/47] Revert "Removing faceauth configs" Revert submission 24039435-cherrypick-FaceHAL-deprecate-raven-yon2bm08mmg Reason for revert: Droidfood blocking bug b/295449925 Reverted changes: /q/submissionid:24039435-cherrypick-FaceHAL-deprecate-raven-yon2bm08mmg Change-Id: Iabd85576568ce66718e625607aa0d31dc8b357cc --- conf/init.raven.rc | 4 ++++ raven/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 2 files changed, 7 insertions(+) diff --git a/conf/init.raven.rc b/conf/init.raven.rc index 4d35ee1..5153c58 100644 --- a/conf/init.raven.rc +++ b/conf/init.raven.rc @@ -11,6 +11,10 @@ on init # Power Stats HAL chown system system /sys/devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power_stats +on fs + # Face + exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/faceauth.app + on property:vendor.mfgapi.touchpanel.permission=1 chmod 0600 /sys/devices/virtual/sec/tsp/cmd chown system system /sys/devices/virtual/sec/tsp/cmd diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index 4c636d8..c8d8730 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -197,6 +197,9 @@ 145px 28dp + + false + 2 3 From 292e9877e87b53080d643e991c391ad3e3b436d3 Mon Sep 17 00:00:00 2001 From: Jiaming Liu Date: Tue, 9 May 2023 05:00:11 +0000 Subject: [PATCH 27/47] Disable WM Extensions on Pixel 6 Bug: 266196089 Test: Build Change-Id: Id317b1626a522f6b7b8a4926c4bdf21ed67bd765 (cherry picked from commit e81ae9f5e14ae9f3d87ac9bfa2456d69edf86d92) --- device-oriole.mk | 7 ------- device-raven.mk | 7 ------- 2 files changed, 14 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 2763be8..3f94723 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -277,13 +277,6 @@ else device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif -# Window Extensions -$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) - -# Disable Settings large-screen optimization enabled by Window Extensions -PRODUCT_SYSTEM_PROPERTIES += \ - persist.settings.large_screen_opt.enabled=false - # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true diff --git a/device-raven.mk b/device-raven.mk index 7036e94..6a15387 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -296,13 +296,6 @@ else device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif -# Window Extensions -$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) - -# Disable Settings large-screen optimization enabled by Window Extensions -PRODUCT_SYSTEM_PROPERTIES += \ - persist.settings.large_screen_opt.enabled=false - # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true From d9250af82dcd3f05e0c23220bd94013c72c178bb Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Tue, 15 Aug 2023 00:10:44 +0000 Subject: [PATCH 28/47] Update raven SVN to 67 Bug: 295937899 Change-Id: Ica94551823469915b4630d90c1c571a5fc5638fb --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 1bee402..c0f34d3 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=66 + ro.vendor.build.svn=67 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 58d7ffaeeb22c8f074d2dd6318fcbd3158e5a3f0 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 16 Aug 2023 05:38:42 +0000 Subject: [PATCH 29/47] Update raven SVN to 68 Bug: 295937899 Change-Id: I860de9766063f9674a6b4a9fd2d2deeea3e1b8f0 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index c0f34d3..cddf95e 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=67 + ro.vendor.build.svn=68 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 0f47de1ea25ab72a9dd50e13ff8217faab831d42 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 16 Aug 2023 05:38:21 +0000 Subject: [PATCH 30/47] Update oriole SVN to 68 Bug: 295937899 Change-Id: I073e25b8e4db19f9680e4ef7cda6baa7c265b925 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 2184715..1393bc0 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=67 + ro.vendor.build.svn=68 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From f0888f94c6fc74c7fdabbfe0b1fc0fba9b9a90bf Mon Sep 17 00:00:00 2001 From: Edwin Tung Date: Thu, 27 Jul 2023 13:46:23 +0800 Subject: [PATCH 31/47] gps: Disable Vzw SUPL OTDOA Bug: 293213801 Test: OTDOA disabled Change-Id: I1bc0f8e69e00c4c963d54c82181ba7839755e84e --- location/gps.xml | 2 +- location/gps.xml.oriole | 2 +- location/gps.xml.raven | 2 +- location/gps_user.xml | 2 +- location/gps_user.xml.oriole | 2 +- location/gps_user.xml.raven | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/location/gps.xml b/location/gps.xml index 7c53415..fb1c305 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole index cd149a7..fc42089 100644 --- a/location/gps.xml.oriole +++ b/location/gps.xml.oriole @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps.xml.raven b/location/gps.xml.raven index 3c6dbc6..555e9ba 100644 --- a/location/gps.xml.raven +++ b/location/gps.xml.raven @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml b/location/gps_user.xml index baf0ee5..0584d48 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole index 558799d..9abad36 100644 --- a/location/gps_user.xml.oriole +++ b/location/gps_user.xml.oriole @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven index 0861857..9ef4706 100644 --- a/location/gps_user.xml.raven +++ b/location/gps_user.xml.raven @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" From 67b3b89756597893a9f2ab2382e272409b76eeda Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Fri, 11 Aug 2023 03:49:47 +0000 Subject: [PATCH 32/47] update the gps conf to the latest version Bug: 290725902 Test: verification test at b/287729267 Change-Id: I0f255799b6beb9153fe59840f4b9ca3f5cffe943 --- location/gps.xml | 2 ++ location/gps.xml.oriole | 2 ++ location/gps.xml.raven | 2 ++ location/gps_user.xml | 2 ++ location/gps_user.xml.oriole | 2 ++ location/gps_user.xml.raven | 2 ++ 6 files changed, 12 insertions(+) diff --git a/location/gps.xml b/location/gps.xml index 26e2805..bf3dc41 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -62,6 +62,7 @@ ReAidingIntervalSec="1200" PpsDevice="/sys/class/pps/pps0/assert_elapsed" SensorsMask="0x244" + MaxThreadNum="13" /> Date: Tue, 29 Aug 2023 15:11:33 +0800 Subject: [PATCH 33/47] gps: enable always-on measurements log Bug: 286158090 Test: verify pass in b/286158090#comment53 Change-Id: I26026b032791a3e8186b7b23a563b77db5e3f417 --- location/gps.xml | 2 +- location/gps.xml.oriole | 2 +- location/gps.xml.raven | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/location/gps.xml b/location/gps.xml index bf3dc41..5db2845 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -68,7 +68,7 @@ Date: Thu, 31 Aug 2023 22:00:57 +0000 Subject: [PATCH 34/47] Revert "nfc: enable nfc debugging for usedebug builds" This reverts commit 3d9d28975611188bdc3718dd6341da2f5504fe86. Reason for revert: b/206628348 Change-Id: Ia44eddb472fffece015a64993a8bc38727e0fd57 --- device-raven.mk | 10 +- nfc/libnfc-hal-st-debug.conf | 159 -------------------------------- nfc/libnfc-nci-raven-debug.conf | 121 ------------------------ 3 files changed, 1 insertion(+), 289 deletions(-) delete mode 100644 nfc/libnfc-hal-st-debug.conf delete mode 100644 nfc/libnfc-nci-raven-debug.conf diff --git a/device-raven.mk b/device-raven.mk index 41269e6..632ee55 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -134,17 +134,9 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \ frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml \ frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.uicc.xml \ - frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml - -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_COPY_FILES += \ - device/google/raviole/nfc/libnfc-hal-st-debug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \ - device/google/raviole/nfc/libnfc-nci-raven-debug.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf -else -PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml \ device/google/raviole/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \ device/google/raviole/nfc/libnfc-nci-raven.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf -endif PRODUCT_PACKAGES += \ NfcNci \ diff --git a/nfc/libnfc-hal-st-debug.conf b/nfc/libnfc-hal-st-debug.conf deleted file mode 100644 index 3b3e1ee..0000000 --- a/nfc/libnfc-hal-st-debug.conf +++ /dev/null @@ -1,159 +0,0 @@ -########################### Start of libnf-hal-st_aosp.conf ########################### - -############################################################################### -############################################################################### -# ST HAL trace log level -STNFC_HAL_LOGLEVEL=4 -NFC_DEBUG_ENABLED=1 - -############################################################################### -# Vendor specific mode to enable FW (RF & SWP) traces. -STNFC_FW_DEBUG_ENABLED=1 - -############################################################################### -# File used for NFA storage -NFA_STORAGE="/data/nfc" - -############################################################################### -# Keep the nfa storage file. -PRESERVE_STORAGE=1 - -############################################################################### -# In Switch OFF mode (phone switched-off), specify the desired CE mode to -# the controller. -# 0: No card-emulation; DEFAULT -# 1: Switch-off card-emulation enabled -CE_ON_SWITCH_OFF_STATE=1 - -############################################################################### -# Vendor specific mode to support the USB charging mode if VPSIO=1 in switch off. -STNFC_USB_CHARGING_MODE=1 - -############################################################################### -# Vendor Specific Proprietary Protocol & Discovery Configuration -# Set to 0xFF if unsupported -# byte[0] NCI_PROTOCOL_18092_ACTIVE -# byte[1] NCI_PROTOCOL_B_PRIME -# byte[2] NCI_PROTOCOL_DUAL -# byte[3] NCI_PROTOCOL_15693 -# byte[4] NCI_PROTOCOL_KOVIO -# byte[5] NCI_PROTOCOL_MIFARE -# byte[6] NCI_DISCOVERY_TYPE_POLL_KOVIO -# byte[7] NCI_DISCOVERY_TYPE_POLL_B_PRIME -# byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME -NFA_PROPRIETARY_CFG={05:FF:FF:06:8A:90:77:FF:FF} - -############################################################################### -# Choose the presence-check algorithm for type-4 tag. If not defined, -# the default value is 1. -# 0 NFA_RW_PRES_CHK_DEFAULT; Let stack selects an algorithm -# 1 NFA_RW_PRES_CHK_I_BLOCK; ISO-DEP protocol's empty I-block -# 2 NFA_RW_PRES_CHK_RESET; Deactivate to Sleep, then re-activate -# 3 NFA_RW_PRES_CHK_RB_CH0; Type-4 tag protocol's ReadBinary command on channel 0 -# 4 NFA_RW_PRES_CHK_RB_CH3; Type-4 tag protocol's ReadBinary command on channel 3 -# 5 NFA_RW_PRES_CHK_ISO_DEP_NAK; presence check command ISO-DEP NAK as per NCI2.0 -PRESENCE_CHECK_ALGORITHM=5 - -############################################################################### -# Name of the NCI HAL module to use -# If unset, falls back to nfc_nci.bcm2079x -NCI_HAL_MODULE="nfc_nci.st21nfc" - -############################################################################### -# Allow list to be set at startup. -DEVICE_HOST_ALLOW_LIST={02:C0} - -############################################################################### -# BAIL OUT value for P2P -# Implements algorithm for NFC-DEP protocol priority over ISO-DEP protocol. -POLL_BAIL_OUT_MODE=1 - -############################################################################### -# Extended APDU length for ISO_DEP -ISO_DEP_MAX_TRANSCEIVE=0xFEFF - -############################################################################### -# Configure the NFC Extras to open and use a static pipe. If the value is -# not set or set to 0, then the default is use a dynamic pipe based on a -# destination gate (see NFA_HCI_DEFAULT_DEST_GATE). Note there is a value -# for each EE (ESE/SIM) -OFF_HOST_ESE_PIPE_ID=0x5E -OFF_HOST_SIM_PIPE_ID=0x3E - -############################################################################### -#Set the default Felica T3T System Code OffHost route Location : -#This settings will be used when application does not set this parameter -# host 0x00 -# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) -# UICC 0x81 (UICC_1), 0x85 (UICC_2) -DEFAULT_SYS_CODE_ROUTE=0x86 - -############################################################################### -#Set the Felica T3T System Code supported power state: -DEFAULT_SYS_CODE_PWR_STATE=0x3B - -############################################################################### -# Path and Files used for FW update binaries storage -STNFC_FW_PATH_STORAGE="/vendor/firmware" -STNFC_FW_BIN_NAME="/st54j_fw.bin" -STNFC_FW_CONF_NAME="/st54j_conf.bin" - -############################################################################### -# Default off-host route for Felica. -# This settings will be used when application does not set this parameter -# host 0x00 -# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) -# UICC 0x81 (UICC_1), 0x85 (UICC_2) -DEFAULT_NFCF_ROUTE=0x86 - -############################################################################### -# Configure the default off-host route. -# used for technology A and B routing -# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) -# UICC 0x81 (UICC_1), 0x85 (UICC_2) -DEFAULT_OFFHOST_ROUTE=0x81 - -############################################################################### -# Configure the default AID route. -# host 0x00 -# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) -# UICC 0x81 (UICC_1), 0x85 (UICC_2) -DEFAULT_ROUTE=0x00 - -############################################################################### -# Configure the NFCEEIDs of offhost UICC. -# UICC 0x81 (UICC_1), 0x85 (UICC_2) -OFFHOST_ROUTE_UICC={81} - -############################################################################### -# Configure the NFCEEIDs of offhost eSEs. -# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) -OFFHOST_ROUTE_ESE={86} - -############################################################################### -# Configure the list of NFCEE for the ISO-DEP routing. -# host 0x00 -# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) -# UICC 0x81 (UICC_1), 0x85 (UICC_2) -DEFAULT_ISODEP_ROUTE=0x81 - -############################################################################### -# Configure the HAL Clock control -# enable 0x01 -# disable 0x00 default value -STNFC_CONTROL_CLK=0x01 - -################################################################################ -# Configure the ACTIVE_RW timer -# Default 0x00, set 0x01 to enable it -STNFC_ACTIVERW_TIMER=0x01 - -################################################################################ -# Core configuration settings -CORE_CONF_PROP={ 20, 02, 0a, 03, - a1, 01, 1e, - a2, 01, 19, - 80, 01, 01 -} - - diff --git a/nfc/libnfc-nci-raven-debug.conf b/nfc/libnfc-nci-raven-debug.conf deleted file mode 100644 index e530888..0000000 --- a/nfc/libnfc-nci-raven-debug.conf +++ /dev/null @@ -1,121 +0,0 @@ -############################################################################### -# Application options -NFC_DEBUG_ENABLED=1 - -############################################################################### -# File used for NFA storage -NFA_STORAGE="/data/nfc" - -############################################################################### -# Force UICC to only listen to the following technology(s). -# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h. -# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | NFA_TECHNOLOGY_MASK_F -UICC_LISTEN_TECH_MASK=0x07 - -############################################################################### -# Set HOST default listen to the following technology(s). -# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h. -# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F -# 0x07 = A + B + F -HOST_LISTEN_TECH_MASK=0x07 - -############################################################################### -# AID for Empty Select command -# If specified, this AID will be substituted when an Empty SELECT command is -# detected. The first byte is the length of the AID. Maximum length is 16. -AID_FOR_EMPTY_SELECT={08:A0:00:00:01:51:00:00:00} - -############################################################################### -# When screen is turned off, specify the desired power state of the controller. -# 0: power-off-sleep state; DEFAULT -# 1: full-power state -# 2: screen-off card-emulation (CE4/CE3/CE1 modes are used) -SCREEN_OFF_POWER_STATE=1 - -############################################################################### -# Force tag polling for the following technology(s). -# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h. -# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | -# NFA_TECHNOLOGY_MASK_F | NFA_TECHNOLOGY_MASK_ISO15693 | -# NFA_TECHNOLOGY_MASK_B_PRIME | NFA_TECHNOLOGY_MASK_KOVIO | -# NFA_TECHNOLOGY_MASK_ACTIVE -# -# Notable bits: -# NFA_TECHNOLOGY_MASK_A 0x01 /* NFC Technology A */ -# NFA_TECHNOLOGY_MASK_B 0x02 /* NFC Technology B */ -# NFA_TECHNOLOGY_MASK_F 0x04 /* NFC Technology F */ -# NFA_TECHNOLOGY_MASK_ISO15693 0x08 /* Proprietary Technology */ -# NFA_TECHNOLOGY_MASK_KOVIO 0x20 /* Proprietary Technology */ -# NFA_TECHNOLOGY_MASK_ACTIVE 0x40 /* NFC Technology Active */ -POLLING_TECH_MASK=0x2F - -############################################################################### -# Force P2P to only listen for the following technology(s). -# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h. -# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F | -# NFA_TECHNOLOGY_MASK_ACTIVE -# -# Notable bits: -# NFA_TECHNOLOGY_MASK_A 0x01 /* NFC Technology A */ -# NFA_TECHNOLOGY_MASK_F 0x04 /* NFC Technology F */ -# NFA_TECHNOLOGY_MASK_ACTIVE 0x40 /* NFC Technology Active */ -P2P_LISTEN_TECH_MASK=0x00 - -PRESERVE_STORAGE=0x01 - -############################################################################### -# Override the stack default for NFA_EE_MAX_EE_SUPPORTED set in nfc_target.h. -# The value is set to 3 by default as it assumes we will discover 0xF2, -# 0xF3, and 0xF4. If a platform will exclude and SE, this value can be reduced -# so that the stack will not wait any longer than necessary. -# Maximum EE supported number -# NXP PN547C2 0x02 -# NXP PN65T 0x03 -# NXP PN548C2 0x02 -# NXP PN66T 0x03 -NFA_MAX_EE_SUPPORTED=0x02 - -############################################################################### -# AID_MATCHING constants -# AID_MATCHING_EXACT_ONLY 0x00 -# AID_MATCHING_EXACT_OR_PREFIX 0x01 -# AID_MATCHING_PREFIX_ONLY 0x02 -# AID_MATCHING_EXACT_OR_SUBSET_OR_PREFIX 0x03 -AID_MATCHING_MODE=0x03 - -############################################################################### -#Set the default Felica T3T System Code : -#This settings will be used when application does not set this parameter -DEFAULT_SYS_CODE={FE:FE} - -############################################################################### -# Value of NIC parameter NFCC_COFNIG_CONTROL -# 0x00 NFCC is not allowed to manage RF configuration -# 0x01 NFCC is allowed to manage RF configuration -NFCC_CONFIG_CONTROL=0x01 - -############################################################################### -#Set if the AID routing should be blocked for the power modes not supported. -NFA_AID_BLOCK_ROUTE=1 - -############################################################################### -#Set the OffHost AID supported power state: -OFFHOST_AID_ROUTE_PWR_STATE=0x3B - -############################################################################### -# Mifare Tag implementation -# 0: General implementation -# 1: Legacy implementation -LEGACY_MIFARE_READER=0 - -############################################################################### -# Nfc recovery implementation -# 0: Crash Nfc Service -# 1: Toggle Nfc state -RECOVERY_OPTION=1 - -############################################################################### -# NFCEE Power Supply and Communication Link Control Configuration -# Set when SetAlwaysOn enabled -# Default 0x00 when SetAlways on disabled -ALWAYS_ON_SET_EE_POWER_AND_LINK_CONF=0x03 From 8913112d57371ff4eea365df530fb7a7e66c14e8 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 6 Sep 2023 23:04:49 +0000 Subject: [PATCH 35/47] Update oriole SVN to 69 Bug: 298087649 Change-Id: I43cf152ebc8c6f944a15e0135f6bcf0c686419bd --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 1393bc0..a56fa02 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=68 + ro.vendor.build.svn=69 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 47b81f69045308d5f452978eb857216c350629b9 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 7 Sep 2023 22:34:00 +0000 Subject: [PATCH 36/47] Update oriole SVN to 70 Bug: 298087649 Change-Id: I5e940376186311fe9d25e252c9080eef894707f2 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index a56fa02..dada41b 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=69 + ro.vendor.build.svn=70 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 7030776f7da68a029e39d109b4724e29de4f666f Mon Sep 17 00:00:00 2001 From: Xin Li Date: Fri, 8 Sep 2023 11:30:44 -0700 Subject: [PATCH 37/47] Set the blew prebuilt apps to PRESIGNED Keep PixelQualifiedNetworksService platfrom key Other apps are no need to re-sign Bug: 290766628 Change-Id: I7bb05c1f0057a15ff76b14af6a7d6390cf5f1fb0 --- self-extractors_oriole/google_devices/staging/Android.mk | 4 ++-- self-extractors_raven/google_devices/staging/Android.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/self-extractors_oriole/google_devices/staging/Android.mk b/self-extractors_oriole/google_devices/staging/Android.mk index 5ae0f03..835f6e8 100644 --- a/self-extractors_oriole/google_devices/staging/Android.mk +++ b/self-extractors_oriole/google_devices/staging/Android.mk @@ -56,7 +56,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE @@ -74,7 +74,7 @@ LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk LOCAL_CERTIFICATE := platform LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice +LOCAL_LICENSE_CONDITIONS := PRESIGNED LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE include $(BUILD_PREBUILT) diff --git a/self-extractors_raven/google_devices/staging/Android.mk b/self-extractors_raven/google_devices/staging/Android.mk index f3ad011..d4e1289 100644 --- a/self-extractors_raven/google_devices/staging/Android.mk +++ b/self-extractors_raven/google_devices/staging/Android.mk @@ -56,7 +56,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE @@ -72,7 +72,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE @@ -88,7 +88,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := qorvo LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE From ff982eb8d2cb3eb49188aa302e9671417c1fe10b Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 7 Sep 2023 01:04:36 +0000 Subject: [PATCH 38/47] Update raven SVN to 69 Bug: 298087649 Change-Id: Icadf953c98a09298511239d30194383706858694 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index cddf95e..12f2e8f 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=68 + ro.vendor.build.svn=69 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 4049cdb9a346f3edbe522a2d6171bea7754e7fa0 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 7 Sep 2023 23:22:32 +0000 Subject: [PATCH 39/47] Update raven SVN to 70 Bug: 298087649 Change-Id: If7417bddc6ef92cbaec5a5537f1260f0536268b5 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 12f2e8f..1f70f37 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=69 + ro.vendor.build.svn=70 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From bf6ba67e93e2c6db307c542ef694b23094bab0a0 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Tue, 19 Sep 2023 03:01:53 +0000 Subject: [PATCH 40/47] 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: I276d3c11e95cfaccaadfe45d58131a34a6bdfb54 --- powerhint-oriole.json | 24 ------------------------ powerhint-raven.json | 24 ------------------------ 2 files changed, 48 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index c101230..f342612 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -597,30 +597,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", diff --git a/powerhint-raven.json b/powerhint-raven.json index 81e01c0..329c33a 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -596,30 +596,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 5ace8cee54d0a3ce4617aaec7ba88a2d60af5bc7 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:13:52 +0000 Subject: [PATCH 41/47] Update raven SVN to 71 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ed76e2420dfa185be32015c8c22d20cb58e1ced2) Merged-In: I8c74f60d0c0437585a1f4bf5ad9d43115ddcc8b1 Change-Id: I8c74f60d0c0437585a1f4bf5ad9d43115ddcc8b1 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 8d198ba..bb20cab 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -186,7 +186,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=70 + ro.vendor.build.svn=71 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From dbd5573846c1d52a2b37eb58e5b895b01260f343 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:20 +0000 Subject: [PATCH 42/47] Update oriole SVN to 71 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:afe27a01390a08b9904130e5eca9f554e5007b4d) Merged-In: If51fdd784e6f45e63331ce984e76632e2236a943 Change-Id: If51fdd784e6f45e63331ce984e76632e2236a943 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index fbf3702..7075e01 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=70 + ro.vendor.build.svn=71 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 4f5896c20a72f963723d162689cfece07e29972c Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:26 +0000 Subject: [PATCH 43/47] Update raven SVN to 72 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c56cc1ffe2b692a70f0a9d4037f00543794c3817) Merged-In: I0d77e8c5e8878196f73fc0cb86406e0ff2bceecc Change-Id: I0d77e8c5e8878196f73fc0cb86406e0ff2bceecc --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index bb20cab..0833143 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -186,7 +186,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=71 + ro.vendor.build.svn=72 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From f055b6ff8f199c7ac242100f60ff4fa3fb63fe28 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:42:52 +0000 Subject: [PATCH 44/47] Update oriole SVN to 72 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:de8cd7d5e9611936c024988558237a12b4fda36f) Merged-In: I8dd3b2389683050f017bbc09946bce8a14e979e8 Change-Id: I8dd3b2389683050f017bbc09946bce8a14e979e8 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 7075e01..70f0b37 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=71 + ro.vendor.build.svn=72 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 68b4cb6227500257bcfffd967ec35cdfd7b7b757 Mon Sep 17 00:00:00 2001 From: Shivakumar Neginal Date: Mon, 16 Oct 2023 18:53:29 +0000 Subject: [PATCH 45/47] Adding Fast Pair extended IDs for Pixel 6 Adding the Fast Pair extended IDs for oriole and raven so that Quick Start shows the right Fast Pair bottom sheet on other devices during setup. Bug: 305516133 Test: Manually flashed a oriole & raven device and validated the FP bottom sheet is displayed on a nearby other device (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4fb3e74540a7be3badfc73f553cfb4b5d960dc5c) Merged-In: Iba09888de27f92e16ab0979a7d62e9a7c6505ff2 Change-Id: Iba09888de27f92e16ab0979a7d62e9a7c6505ff2 --- device-oriole.mk | 5 +++++ device-raven.mk | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 70f0b37..c6ae0ed 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -280,3 +280,8 @@ endif # 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=oriole diff --git a/device-raven.mk b/device-raven.mk index 0833143..faf89b1 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -291,3 +291,7 @@ endif # 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=raven From d9627e21f187a8e231f11e90dfb1e2b0a5d4f918 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 26 Oct 2023 05:07:47 +0000 Subject: [PATCH 46/47] Update raven SVN to 73 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6715a1002e4b73f62a1e233234a857e4ea5dcf61) Merged-In: Ie036112a3c0890629e5169991dc76c0407705b39 Change-Id: Ie036112a3c0890629e5169991dc76c0407705b39 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index faf89b1..6a2f758 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -186,7 +186,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=72 + ro.vendor.build.svn=73 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 1e51c14cff850f719660ebb66be81e78937e724a Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 26 Oct 2023 04:57:37 +0000 Subject: [PATCH 47/47] Update oriole SVN to 73 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0240e9137174abd21bcec6332f6a3e959437ac23) Merged-In: Ib2893f0b721498f7c2b71377e79123765afd164f Change-Id: Ib2893f0b721498f7c2b71377e79123765afd164f --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index c6ae0ed..a260d2d 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=72 + ro.vendor.build.svn=73 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \