From f5a0584db7995bd32bbad497a9a7dd779e417222 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:14:25 +0000 Subject: [PATCH 01/17] Update felix SVN to 28 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0804c4be4d794661f56a24f23970c05a3b671097) Merged-In: If52eb638b160fd202e0511f6213fa5c5bce4975e Change-Id: If52eb638b160fd202e0511f6213fa5c5bce4975e --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index a71da60..1c6461b 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=27 + ro.vendor.build.svn=28 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From aa4d849349d1c0bb045a3640938409eb6ca396fe Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:53 +0000 Subject: [PATCH 02/17] Update felix SVN to 29 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0c650e810d598f67b21cb0f862c12c1d4fd68490) Merged-In: Ia1f09da58824a8300e364bd3236fad0685ee5508 Change-Id: Ia1f09da58824a8300e364bd3236fad0685ee5508 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 1c6461b..b2ed3f2 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=28 + ro.vendor.build.svn=29 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From 403b895a06e2ce0328816cfaca6960908d4725e6 Mon Sep 17 00:00:00 2001 From: Shivakumar Neginal Date: Mon, 16 Oct 2023 20:33:18 +0000 Subject: [PATCH 03/17] Adding Fast Pair extended IDs for F10 Adding the Fast Pair extended IDs for felix 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:9931ca082a643bd498f22cfa59d4d7954bce6e63) Merged-In: Iec1e7b85e802e55b204d0bebfaf9c2f83ca588f2 Change-Id: Iec1e7b85e802e55b204d0bebfaf9c2f83ca588f2 --- device-felix.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/device-felix.mk b/device-felix.mk index b2ed3f2..9c61e17 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -372,3 +372,8 @@ PRODUCT_PACKAGES_DEBUG += \ # 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=felix From dffbdd0b0fa760604e0a333c4deab8a262570a4b Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 26 Oct 2023 05:24:04 +0000 Subject: [PATCH 04/17] Update felix SVN to 30 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:acd9c7a658123df92ee49b358b01bc5811911905) Merged-In: Idf4b4f1f1f14b86b3205ba8249e0aeb0fb377359 Change-Id: Idf4b4f1f1f14b86b3205ba8249e0aeb0fb377359 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 9c61e17..4bd6ec1 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=29 + ro.vendor.build.svn=30 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From e32682b14c23472050480ea319cc0cb0edde22bd Mon Sep 17 00:00:00 2001 From: Poomarin Phloyphisut Date: Tue, 7 Nov 2023 07:01:15 +0000 Subject: [PATCH 05/17] [CCA] Set enable flag by default on Felix. Bug: 309566086 Test: N/A Change-Id: Ibf847c16f69d8606b2fec8fe82930a7149632290 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index bb1070f..84b4dfc 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ ##Audio Vendor property PRODUCT_PROPERTY_OVERRIDES += \ - persist.vendor.audio.cca.enabled=true + persist.vendor.audio.cca.enabled=false # Camera PRODUCT_PROPERTY_OVERRIDES += \ From 11d33159070c2b3dcb0d0de1e5de0ad2e7f044ef Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Mon, 27 Nov 2023 17:54:59 +0800 Subject: [PATCH 06/17] felix: update AIDL IGoogleBattery manifest version to 3 Bug: 313379822 Test: TH Change-Id: I0b190e62c67eaf9e0115a7355abf50f1663acc40 Signed-off-by: Jack Wu --- manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.xml b/manifest.xml index 0f075c1..ae2f526 100644 --- a/manifest.xml +++ b/manifest.xml @@ -114,7 +114,7 @@ vendor.google.google_battery - 2-3 + 3 IGoogleBattery default From 70828aea7cc6f3643c4bfa58242f9c50dac1c4dd Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 06:34:49 +0000 Subject: [PATCH 07/17] Update felix SVN to 34 Bug: 313696499 Change-Id: I8e4178345c1e91d3dd7b203ac4462e29c07aff0b --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 368ec51..fb1c0f1 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=33 + ro.vendor.build.svn=34 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From a2ba6a362633b2dcd02a4df6c6dca5bfca20b46a Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 06:38:45 +0000 Subject: [PATCH 08/17] Update felix SVN to 35 Bug: 313696499 Change-Id: I0e48bc56e019bcec717685f2e9f2ce2ce23f06af --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index fb1c0f1..df38a1b 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=34 + ro.vendor.build.svn=35 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From 88bf1ddb44376034ec4975e83978715fec1d2c85 Mon Sep 17 00:00:00 2001 From: Hawkwood Glazier Date: Fri, 1 Dec 2023 21:35:45 +0000 Subject: [PATCH 09/17] Modify folded smartspace postioning on felix Flag: NONE Bug: 313530576 Test: Manually checked positioning Change-Id: I2d326eb259aee2b33aa8bd90abed09bb118d6b3c --- .../base/packages/SystemUI/res-keyguard/values/dimens.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/felix/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml b/felix/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml index 9cbf278..4f1e1f3 100644 --- a/felix/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml +++ b/felix/overlay/frameworks/base/packages/SystemUI/res-keyguard/values/dimens.xml @@ -19,5 +19,5 @@ 0.85 -40dp - -5dp + -15dp From d67ac5d535e382e03ce2be6ebcd73f50e5aea4e2 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: [PATCH 10/17] Revert^2 "felix: Replace NFC app with NFC apex" 09c1ce320b7948c069bc48645b90eb55cae2bd3e Bug: 303286040 Test: Compiles Change-Id: I958b2a07dbde6f036b3a615fde6e4255c59a0843 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 11d4fe9..eb322e2 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -100,7 +100,7 @@ PRODUCT_COPY_FILES += \ device/google/felix/nfc/libnfc-nci-felix.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st From 7777a61a891357a9e50ca21d9b6ac730647dc995 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: [PATCH 11/17] Revert^2 "felix(nfc): Modify NFC overlays for NFC apex" e274b4177afaa690f9bb218bec0a80a2cdc99643 Bug: 303286040 Test: Compiles Change-Id: I56beefccd8cd5f5d12f6b867a31af60314826242 --- device-felix.mk | 3 +- rro_overlays/NfcOverlay/Android.bp | 9 +++++ rro_overlays/NfcOverlay/AndroidManifest.xml | 27 ++++++++++++++ rro_overlays/NfcOverlay/OWNERS | 2 ++ rro_overlays/NfcOverlay/res/values/config.xml | 35 +++++++++++++++++++ 5 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 rro_overlays/NfcOverlay/Android.bp create mode 100644 rro_overlays/NfcOverlay/AndroidManifest.xml create mode 100644 rro_overlays/NfcOverlay/OWNERS create mode 100644 rro_overlays/NfcOverlay/res/values/config.xml diff --git a/device-felix.mk b/device-felix.mk index eb322e2..2e36329 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -102,7 +102,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayFelix # SecureElement PRODUCT_PACKAGES += \ diff --git a/rro_overlays/NfcOverlay/Android.bp b/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..580f845 --- /dev/null +++ b/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_felix_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayFelix", + sdk_version: "current", + product_specific: true +} diff --git a/rro_overlays/NfcOverlay/AndroidManifest.xml b/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/rro_overlays/NfcOverlay/OWNERS b/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/rro_overlays/NfcOverlay/res/values/config.xml b/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..5e89b28 --- /dev/null +++ b/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ + + + + true + + G9FPL + G0B96 + + true + + 160 + 140 + true + + 90 + 30 + + + 103 + 103 + + From ec09d678cb892273de4ac2f0cf726a4e94031b49 Mon Sep 17 00:00:00 2001 From: David Chen Date: Thu, 30 Nov 2023 09:21:27 +0000 Subject: [PATCH 12/17] Add zoom boost in powerhint for F10 This patch is meant to reduce frame drop rate in 60FPS video recording with zoom in/out. The boost will be triggered at 60FPS video recording while zoom ratio change (for each request that contain zoom ratio control in metadata), and will last for 15 frames. Test: gca_smoke_test Bug: 305613607 Change-Id: Ia2a6a452cf2ac7b8ee7a1bd53e5085582d79a2be --- powerhint.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/powerhint.json b/powerhint.json index 95b7535..fbcc819 100644 --- a/powerhint.json +++ b/powerhint.json @@ -319,7 +319,7 @@ "Values": [ "0", "1" - ], + ] }, { "Name": "DisplayWakeup", @@ -1053,6 +1053,18 @@ "Duration": 1000, "Value": "664000" }, + { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "TAPreferHighCap", From 4f0ccbaa17dd686d47f03a5f74a8ad601af94d1a Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Wed, 6 Dec 2023 21:31:29 +0000 Subject: [PATCH 13/17] Revert^2 "felix: Replace NFC app with NFC apex" 09c1ce320b7948c069bc48645b90eb55cae2bd3e Bug: 303286040 Test: Compiles (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d67ac5d535e382e03ce2be6ebcd73f50e5aea4e2) Merged-In: I958b2a07dbde6f036b3a615fde6e4255c59a0843 Change-Id: I958b2a07dbde6f036b3a615fde6e4255c59a0843 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 09d5fb4..bf72305 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -97,7 +97,7 @@ PRODUCT_COPY_FILES += \ device/google/felix/nfc/libnfc-nci-felix.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st From bd1c49a92b91bc04f9886cf10c34daf703121351 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: [PATCH 14/17] Revert^2 "felix(nfc): Modify NFC overlays for NFC apex" e274b4177afaa690f9bb218bec0a80a2cdc99643 Bug: 303286040 Test: Compiles (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7777a61a891357a9e50ca21d9b6ac730647dc995) Merged-In: I56beefccd8cd5f5d12f6b867a31af60314826242 Change-Id: I56beefccd8cd5f5d12f6b867a31af60314826242 Change-Id: Ib7b639849fed4d39424866716d5eee2c5248a312 --- device-felix.mk | 3 +- rro_overlays/NfcOverlay/Android.bp | 9 +++++ rro_overlays/NfcOverlay/AndroidManifest.xml | 27 ++++++++++++++ rro_overlays/NfcOverlay/OWNERS | 2 ++ rro_overlays/NfcOverlay/res/values/config.xml | 35 +++++++++++++++++++ 5 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 rro_overlays/NfcOverlay/Android.bp create mode 100644 rro_overlays/NfcOverlay/AndroidManifest.xml create mode 100644 rro_overlays/NfcOverlay/OWNERS create mode 100644 rro_overlays/NfcOverlay/res/values/config.xml diff --git a/device-felix.mk b/device-felix.mk index 09d5fb4..a2b1b8a 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -99,7 +99,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayFelix # SecureElement PRODUCT_PACKAGES += \ diff --git a/rro_overlays/NfcOverlay/Android.bp b/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..580f845 --- /dev/null +++ b/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_felix_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayFelix", + sdk_version: "current", + product_specific: true +} diff --git a/rro_overlays/NfcOverlay/AndroidManifest.xml b/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/rro_overlays/NfcOverlay/OWNERS b/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/rro_overlays/NfcOverlay/res/values/config.xml b/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..5e89b28 --- /dev/null +++ b/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ + + + + true + + G9FPL + G0B96 + + true + + 160 + 140 + true + + 90 + 30 + + + 103 + 103 + + From 6df29a10ccce498cb87fafcc7a1c65a0209ed146 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 23:51:45 +0000 Subject: [PATCH 15/17] Update felix SVN to 36 Bug: 313797924 Change-Id: I899429fe04a85e1967a913d4887f9528b4f162d9 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index df38a1b..c27b6ff 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=35 + ro.vendor.build.svn=36 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From fbf929ec6a5084b306ed0ba3eb1afaf10af86204 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 23:52:46 +0000 Subject: [PATCH 16/17] Update felix SVN to 37 Bug: 313797924 Change-Id: Ibbf8f514b3ecfa8013d9cc1138f0df8f8835d411 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index c27b6ff..4ea3595 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=36 + ro.vendor.build.svn=37 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From 302f0a318f78af33430ca717269a215b6fdc47e4 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 13 Dec 2023 17:03:08 +0800 Subject: [PATCH 17/17] Branch bootloader prebuilts for 24Q2 release Bug: 313350495 Change-Id: Id61bda25845fd181ade10f12e3bc3554db4f6978 --- device-felix.mk | 2 ++ felix/BoardConfig.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/device-felix.mk b/device-felix.mk index 84fe534..b1a0caa 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -257,6 +257,8 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/trunk endif diff --git a/felix/BoardConfig.mk b/felix/BoardConfig.mk index 72b542b..1aaac33 100644 --- a/felix/BoardConfig.mk +++ b/felix/BoardConfig.mk @@ -23,6 +23,8 @@ BOARD_KERNEL_CMDLINE += swiotlb=noforce RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_FELIX_RADIO_DIR) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif