From c49f3a5968ae39dcb0d0e317d5253a0615ac67f9 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:14:12 +0000 Subject: [PATCH 01/26] Update cheetah SVN to 35 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a6e9460ef2d4bce86efbc3498b665fba469f232b) Merged-In: Ib512f6ca86a5b87b2bc521f85e271d84603eb0c9 Change-Id: Ib512f6ca86a5b87b2bc521f85e271d84603eb0c9 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 62556a9..26dbef7 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=34 + ro.vendor.build.svn=35 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From e0b5b435ea88d7f2e00cd99269072cf114f707ce Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:37 +0000 Subject: [PATCH 02/26] Update panther SVN to 35 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ec9b31a675ff49fc12e9a81b5a961c3c334f91e3) Merged-In: I8d176a2ba9ddef34449edae5df6fdfd55d346c51 Change-Id: I8d176a2ba9ddef34449edae5df6fdfd55d346c51 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 1416685..f2dd9f8 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=34 + ro.vendor.build.svn=35 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 779fc5b7021480bcf5f1681b9b3ad6f074e7b7fe Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:43 +0000 Subject: [PATCH 03/26] Update cheetah SVN to 36 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:92a618d04ff92d8410f7d035236bac7fe5c3d537) Merged-In: I639d80c0b9f299cffef48fb7719cfbacc776ba45 Change-Id: I639d80c0b9f299cffef48fb7719cfbacc776ba45 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 26dbef7..736f80f 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=35 + ro.vendor.build.svn=36 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From b851e4ef988525418e1cd04adf65e041aa00edba Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:14:04 +0000 Subject: [PATCH 04/26] Update panther SVN to 36 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:59025a6c836b8eae7ec6e2f59da3f920c4e13033) Merged-In: I29083bb2d81f0cf11940d7f1ea2ce28922ea830e Change-Id: I29083bb2d81f0cf11940d7f1ea2ce28922ea830e --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index f2dd9f8..a6135f0 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=35 + ro.vendor.build.svn=36 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From cd89e65ff314aeb4e050b0ce9075a38fb9b7df6f Mon Sep 17 00:00:00 2001 From: Shivakumar Neginal Date: Mon, 16 Oct 2023 19:07:14 +0000 Subject: [PATCH 05/26] Adding Fast Pair extended IDs for Pixel 7 Adding the Fast Pair extended IDs for Pixel 7 so that Quick Start shows the right Fast Pair bottom sheet on other devices during setup. Bug: 305516133 Test: Manually flashed a cheetha and panther 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:ec518897c23085d558af3971154bdf09ab8256c5) Merged-In: I29599f388b0689db5e105d00ccf9f4bbfde9d84a Change-Id: I29599f388b0689db5e105d00ccf9f4bbfde9d84a --- device-cheetah.mk | 5 +++++ device-panther.mk | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 736f80f..f3e6c11 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -385,3 +385,8 @@ PRODUCT_SYSTEM_PROPERTIES += \ # 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=cheetah diff --git a/device-panther.mk b/device-panther.mk index a6135f0..d70907c 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -370,3 +370,8 @@ PRODUCT_SYSTEM_PROPERTIES += \ # 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=panther From 19c3062b80e94360dbd2f71018be617d2f92b5b4 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 26 Oct 2023 05:17:11 +0000 Subject: [PATCH 06/26] Update cheetah SVN to 37 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9205873929d4f1afe7a09c4f322fa7bbeb18fd98) Merged-In: I19ff3f5174554e51af5201ec3b5928cfaddf26f6 Change-Id: I19ff3f5174554e51af5201ec3b5928cfaddf26f6 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index f3e6c11..742544c 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=36 + ro.vendor.build.svn=37 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 4d4bede613fc5037dd3047a8008ab5d2ad034ad2 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 26 Oct 2023 05:13:58 +0000 Subject: [PATCH 07/26] Update panther SVN to 37 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a1eee239bb39277c5afb0074a30c20244bf68692) Merged-In: I075a42359d9cdc1984dfb2057808fb1a9bd8e909 Change-Id: I075a42359d9cdc1984dfb2057808fb1a9bd8e909 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index d70907c..aff4d8c 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=36 + ro.vendor.build.svn=37 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 2e4890b8ead182de69a7033f21c6997277bb3596 Mon Sep 17 00:00:00 2001 From: Shin-Yu Wang Date: Fri, 24 Nov 2023 09:36:37 +0000 Subject: [PATCH 08/26] Revert "Update idle timer setting" This reverts commit a008293ba5b7f5b57bab0f1b25aa9c205204dadb. Reason for revert: broken test b/312417871 Bug: 307593860 Change-Id: Ia6db7b3fd4e22dce5443877756f9881d48214019 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index a2583cf..39cde7b 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -261,7 +261,7 @@ $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factor endif # Display -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1000 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true # WiFi Overlay From 119db5acb6d133d9191d87ca99849617a8ca78fa Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 06:26:57 +0000 Subject: [PATCH 09/26] Update cheetah SVN to 41 Bug: 313696499 Change-Id: If57b5ff9871f4daecae1b2219e7d3fcb456dde5e --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index e6c0d7f..0b00963 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=40 + ro.vendor.build.svn=41 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 75a9c0a8ef8c59b940a4a59788402cc4b71c075f Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 06:28:20 +0000 Subject: [PATCH 10/26] Update cheetah SVN to 42 Bug: 313696499 Change-Id: I7658cd580290f964bc5391e0874cf3e8bece6a8c --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 0b00963..b9e7c88 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=41 + ro.vendor.build.svn=42 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 1695374b6413a84d3de25ec559ccb28b33638847 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 06:21:15 +0000 Subject: [PATCH 11/26] Update panther SVN to 41 Bug: 313696499 Change-Id: Ic6534eee5f78ca57f7f9529b1c35ccfb3cafae74 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 4cfa0a0..9900755 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=40 + ro.vendor.build.svn=41 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From e66288cae4630fa076be4a950117f8d8e11931b7 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 06:23:19 +0000 Subject: [PATCH 12/26] Update panther SVN to 42 Bug: 313696499 Change-Id: I9eec5502196e2b1b681152a604ba0e0d64a37ea8 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 9900755..e09cf45 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=41 + ro.vendor.build.svn=42 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From aa3c94e272d388cc559f58faabb85caa2eeef48e Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: [PATCH 13/26] Revert^2 "pantah: Replace NFC app with NFC apex" 3000cdee0ef5284ba9fdc68bcdebedbcceb65b10 Bug: 303286040 Test: Compiles Change-Id: I4da74311505445715132b84afb557ec7e126abac --- device-cheetah.mk | 2 +- device-cloudripper.mk | 2 +- device-panther.mk | 2 +- device-ravenclaw.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index e9ba6e4..be0451e 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -111,7 +111,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci-cheetah.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 8b2b419..0347420 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -65,7 +65,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st diff --git a/device-panther.mk b/device-panther.mk index 9501bb4..b90108a 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -90,7 +90,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci-panther.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index d6da01d..9906272 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -69,7 +69,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st From 2280e6ea3db5e414f1ace9734d3066d9b3eb4654 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: [PATCH 14/26] Revert^2 "pantah(nfc): Modify NFC overlays for NFC apex" 08fbfb05f16c273d2940d2b687a5113990f4a3ea Bug: 303286040 Test: Compiles Change-Id: I4ea4668bd7de33fa5a6c80b742dab0a6b27b4936 --- cheetah/rro_overlays/NfcOverlay/Android.bp | 9 +++++ .../NfcOverlay/AndroidManifest.xml | 27 ++++++++++++++ cheetah/rro_overlays/NfcOverlay/OWNERS | 2 ++ .../NfcOverlay/res/values/config.xml | 35 +++++++++++++++++++ device-cheetah.mk | 3 +- device-panther.mk | 3 +- panther/rro_overlays/NfcOverlay/Android.bp | 9 +++++ .../NfcOverlay/AndroidManifest.xml | 27 ++++++++++++++ panther/rro_overlays/NfcOverlay/OWNERS | 2 ++ .../NfcOverlay/res/values/config.xml | 35 +++++++++++++++++++ 10 files changed, 150 insertions(+), 2 deletions(-) create mode 100644 cheetah/rro_overlays/NfcOverlay/Android.bp create mode 100644 cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml create mode 100644 cheetah/rro_overlays/NfcOverlay/OWNERS create mode 100644 cheetah/rro_overlays/NfcOverlay/res/values/config.xml create mode 100644 panther/rro_overlays/NfcOverlay/Android.bp create mode 100644 panther/rro_overlays/NfcOverlay/AndroidManifest.xml create mode 100644 panther/rro_overlays/NfcOverlay/OWNERS create mode 100644 panther/rro_overlays/NfcOverlay/res/values/config.xml diff --git a/cheetah/rro_overlays/NfcOverlay/Android.bp b/cheetah/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..83a878d --- /dev/null +++ b/cheetah/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_pantah_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayCheetah", + sdk_version: "current", + product_specific: true +} diff --git a/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml b/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/cheetah/rro_overlays/NfcOverlay/OWNERS b/cheetah/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/cheetah/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/cheetah/rro_overlays/NfcOverlay/res/values/config.xml b/cheetah/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..0055264 --- /dev/null +++ b/cheetah/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ + + + + true + true + + GP4BC + GE2AE + GFE4J + + true + + 75 + 160 + false + + 38 + + + 100 + + diff --git a/device-cheetah.mk b/device-cheetah.mk index be0451e..15381b8 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -113,7 +113,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayCheetah # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-panther.mk b/device-panther.mk index b90108a..969a6c6 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -92,7 +92,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayPanther # SecureElement PRODUCT_PACKAGES += \ diff --git a/panther/rro_overlays/NfcOverlay/Android.bp b/panther/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..a1d3b96 --- /dev/null +++ b/panther/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_pantah_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayPanther", + sdk_version: "current", + product_specific: true +} diff --git a/panther/rro_overlays/NfcOverlay/AndroidManifest.xml b/panther/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/panther/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/panther/rro_overlays/NfcOverlay/OWNERS b/panther/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/panther/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/panther/rro_overlays/NfcOverlay/res/values/config.xml b/panther/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..d5bfd3d --- /dev/null +++ b/panther/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ + + + + false + true + + GQML3 + GVU6C + G03Z5 + + true + + 70 + 150 + false + + 38 + + + 97 + + From 61abf7319e10837fcb0868cad3807b8a502cb80b Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: [PATCH 15/26] Revert^2 "pantah: Replace NFC app with NFC apex" 3000cdee0ef5284ba9fdc68bcdebedbcceb65b10 Bug: 303286040 Test: Compiles (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:aa3c94e272d388cc559f58faabb85caa2eeef48e) Merged-In: I4da74311505445715132b84afb557ec7e126abac Change-Id: I4da74311505445715132b84afb557ec7e126abac Change-Id: I39f927d3cee2ec84616ecb56704fc2b5d4d4896e --- device-cheetah.mk | 2 +- device-cloudripper.mk | 2 +- device-panther.mk | 2 +- device-ravenclaw.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 01e0dd3..e7b42ee 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -115,7 +115,7 @@ PRODUCT_COPY_FILES += \ endif PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 0a4dfc1..6abb728 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -69,7 +69,7 @@ PRODUCT_COPY_FILES += \ endif PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st diff --git a/device-panther.mk b/device-panther.mk index dde9314..36253be 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -94,7 +94,7 @@ PRODUCT_COPY_FILES += \ endif PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index b3607e7..0f3af6d 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -66,7 +66,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st From 7ca0bc89820f23b0ee2c0bbe501107381960fb00 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: [PATCH 16/26] Revert^2 "pantah(nfc): Modify NFC overlays for NFC apex" 08fbfb05f16c273d2940d2b687a5113990f4a3ea Bug: 303286040 Test: Compiles (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2280e6ea3db5e414f1ace9734d3066d9b3eb4654) Merged-In: I4ea4668bd7de33fa5a6c80b742dab0a6b27b4936 Change-Id: I4ea4668bd7de33fa5a6c80b742dab0a6b27b4936 Change-Id: Ie620addb17b635f30a6d79661cd3f0ded2afe0df --- cheetah/rro_overlays/NfcOverlay/Android.bp | 9 +++++ .../NfcOverlay/AndroidManifest.xml | 27 ++++++++++++++ cheetah/rro_overlays/NfcOverlay/OWNERS | 2 ++ .../NfcOverlay/res/values/config.xml | 35 +++++++++++++++++++ device-cheetah.mk | 3 +- device-panther.mk | 3 +- panther/rro_overlays/NfcOverlay/Android.bp | 9 +++++ .../NfcOverlay/AndroidManifest.xml | 27 ++++++++++++++ panther/rro_overlays/NfcOverlay/OWNERS | 2 ++ .../NfcOverlay/res/values/config.xml | 35 +++++++++++++++++++ 10 files changed, 150 insertions(+), 2 deletions(-) create mode 100644 cheetah/rro_overlays/NfcOverlay/Android.bp create mode 100644 cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml create mode 100644 cheetah/rro_overlays/NfcOverlay/OWNERS create mode 100644 cheetah/rro_overlays/NfcOverlay/res/values/config.xml create mode 100644 panther/rro_overlays/NfcOverlay/Android.bp create mode 100644 panther/rro_overlays/NfcOverlay/AndroidManifest.xml create mode 100644 panther/rro_overlays/NfcOverlay/OWNERS create mode 100644 panther/rro_overlays/NfcOverlay/res/values/config.xml diff --git a/cheetah/rro_overlays/NfcOverlay/Android.bp b/cheetah/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..83a878d --- /dev/null +++ b/cheetah/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_pantah_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayCheetah", + sdk_version: "current", + product_specific: true +} diff --git a/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml b/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/cheetah/rro_overlays/NfcOverlay/OWNERS b/cheetah/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/cheetah/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/cheetah/rro_overlays/NfcOverlay/res/values/config.xml b/cheetah/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..0055264 --- /dev/null +++ b/cheetah/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ + + + + true + true + + GP4BC + GE2AE + GFE4J + + true + + 75 + 160 + false + + 38 + + + 100 + + diff --git a/device-cheetah.mk b/device-cheetah.mk index e7b42ee..6ce4cf4 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -117,7 +117,8 @@ endif PRODUCT_PACKAGES += \ $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayCheetah # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-panther.mk b/device-panther.mk index 36253be..50fd0c8 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -96,7 +96,8 @@ endif PRODUCT_PACKAGES += \ $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayPanther # SecureElement PRODUCT_PACKAGES += \ diff --git a/panther/rro_overlays/NfcOverlay/Android.bp b/panther/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..a1d3b96 --- /dev/null +++ b/panther/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_pantah_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayPanther", + sdk_version: "current", + product_specific: true +} diff --git a/panther/rro_overlays/NfcOverlay/AndroidManifest.xml b/panther/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/panther/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/panther/rro_overlays/NfcOverlay/OWNERS b/panther/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/panther/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/panther/rro_overlays/NfcOverlay/res/values/config.xml b/panther/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..d5bfd3d --- /dev/null +++ b/panther/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ + + + + false + true + + GQML3 + GVU6C + G03Z5 + + true + + 70 + 150 + false + + 38 + + + 97 + + From cb784ede3161338c943785621f07ab37b118b606 Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Thu, 17 Aug 2023 12:05:43 -0700 Subject: [PATCH 17/26] powerhint: add game mode tuning nodes Add down_rate_limit_us nodes, tapered_dvfs_headroom nodes. Test: build Bug: 295636226 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ed55bd67b0a7cdb1521f4df70b7c854246aa4492) Merged-In: I826da5058916abb1e676774ef19fe05710588392 Change-Id: I826da5058916abb1e676774ef19fe05710588392 --- powerhint-cheetah-a0.json | 40 ++++++++++++++++++++++++++++++++++++++ powerhint-cheetah.json | 40 ++++++++++++++++++++++++++++++++++++++ powerhint-cloudripper.json | 40 ++++++++++++++++++++++++++++++++++++++ powerhint-panther-a0.json | 40 ++++++++++++++++++++++++++++++++++++++ powerhint-panther.json | 40 ++++++++++++++++++++++++++++++++++++++ powerhint-ravenclaw.json | 40 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 240 insertions(+) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 411c7fb..c73d20a 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -48,6 +48,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -80,6 +90,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -114,6 +134,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", @@ -147,6 +177,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 4d6c413..45b0b7d 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -61,6 +61,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -93,6 +103,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -127,6 +147,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "GPUDvfsPeriod", "Path": "/sys/devices/platform/28000000.mali/dvfs_period", @@ -165,6 +195,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json index 3ac19d4..c985b53 100644 --- a/powerhint-cloudripper.json +++ b/powerhint-cloudripper.json @@ -41,6 +41,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -64,6 +74,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -86,6 +106,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", @@ -119,6 +149,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index d965a04..2848382 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -47,6 +47,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -75,6 +85,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -103,6 +123,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", @@ -136,6 +166,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", diff --git a/powerhint-panther.json b/powerhint-panther.json index 46b5ff9..0a4bce9 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -60,6 +60,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -88,6 +98,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -116,6 +136,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "ReducePreferIdle", "Path": "/proc/vendor_sched/reduce_prefer_idle", @@ -145,6 +175,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", diff --git a/powerhint-ravenclaw.json b/powerhint-ravenclaw.json index 0eefcf6..06f5377 100644 --- a/powerhint-ravenclaw.json +++ b/powerhint-ravenclaw.json @@ -41,6 +41,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -64,6 +74,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -86,6 +106,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", @@ -119,6 +149,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", From 4414d256ef6ed22656c72233eef18c91adcfbb3f Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Thu, 17 Aug 2023 12:18:34 -0700 Subject: [PATCH 18/26] powerhint: game mode tuning Test: Load powerhint file on device and verify tuned parameters are default. Start Subway Surfers game and verify tuned parameters are expected tuned values. Switch away from game, and quit the game, and verify tuned parameters return to default. Bug: 295636226 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c1688eb48e4de7f6de344f406e3880e0a46ebcaa) Merged-In: I7b5346f05dc06c18f986c52805bfbb979ae173f5 Change-Id: I7b5346f05dc06c18f986c52805bfbb979ae173f5 --- powerhint-cheetah-a0.json | 78 +++++++++++++++++++++++++++++++++++--- powerhint-cheetah.json | 78 +++++++++++++++++++++++++++++++++++--- powerhint-cloudripper.json | 72 +++++++++++++++++++++++++++++++++++ powerhint-panther-a0.json | 78 +++++++++++++++++++++++++++++++++++--- powerhint-panther.json | 78 +++++++++++++++++++++++++++++++++++--- powerhint-ravenclaw.json | 72 +++++++++++++++++++++++++++++++++++ 6 files changed, 432 insertions(+), 24 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index c73d20a..c98446c 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -684,12 +684,6 @@ "Duration": 1000, "Value": "0-3" }, - { - "PowerHint": "LAUNCH", - "Node": "FGPreferIdle", - "Duration": 5000, - "Value": "1" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -708,6 +702,48 @@ "Duration": 5000, "Value": "9999999" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", @@ -1788,6 +1824,36 @@ "Duration": 0, "Value": "572000" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", "Node": "PMU_POLL", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 45b0b7d..6a209c1 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -733,12 +733,6 @@ "Duration": 1000, "Value": "10" }, - { - "PowerHint": "LAUNCH", - "Node": "FGPreferIdle", - "Duration": 5000, - "Value": "1" - }, { "PowerHint": "LAUNCH", "Type": "DoHint", @@ -762,6 +756,48 @@ "Duration": 5000, "Value": "9999999" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", @@ -2008,6 +2044,36 @@ "Duration": 0, "Value": "572000" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json index c985b53..6d10711 100644 --- a/powerhint-cloudripper.json +++ b/powerhint-cloudripper.json @@ -452,6 +452,48 @@ "Duration": 5000, "Value": "9999999" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", @@ -1132,6 +1174,36 @@ "Duration": 0, "Value": "572000" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "FP_BOOST", "Node": "CPUBigClusterMaxFreq", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 2848382..5737a14 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -673,12 +673,6 @@ "Duration": 1000, "Value": "0-3" }, - { - "PowerHint": "LAUNCH", - "Node": "FGPreferIdle", - "Duration": 5000, - "Value": "1" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -697,6 +691,48 @@ "Duration": 5000, "Value": "9999999" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", @@ -1675,6 +1711,36 @@ "Duration": 0, "Value": "572000" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", "Node": "PMU_POLL", diff --git a/powerhint-panther.json b/powerhint-panther.json index 0a4bce9..2141e41 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -707,12 +707,6 @@ "Duration": 5000, "Value": "0" }, - { - "PowerHint": "LAUNCH", - "Node": "FGPreferIdle", - "Duration": 5000, - "Value": "1" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -731,6 +725,48 @@ "Duration": 5000, "Value": "9999999" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", @@ -1864,6 +1900,36 @@ "Duration": 0, "Value": "572000" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", diff --git a/powerhint-ravenclaw.json b/powerhint-ravenclaw.json index 06f5377..d01f39c 100644 --- a/powerhint-ravenclaw.json +++ b/powerhint-ravenclaw.json @@ -452,6 +452,48 @@ "Duration": 5000, "Value": "9999999" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", @@ -1132,6 +1174,36 @@ "Duration": 0, "Value": "572000" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "FP_BOOST", "Node": "CPUBigClusterMaxFreq", From 77141f29c55bb75123b60e9ab1f390c5ebf15d7c Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 23:40:51 +0000 Subject: [PATCH 19/26] Update panther SVN to 43 Bug: 313797924 Change-Id: Id3546da8690b20b484cec286dfa336a354d9f575 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index e09cf45..43f0c2b 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=42 + ro.vendor.build.svn=43 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From b43929798cc6fef9c765e0308597d36149102167 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 23:44:13 +0000 Subject: [PATCH 20/26] Update cheetah SVN to 43 Bug: 313797924 Change-Id: Iee6887b786bfdb7738d6df22e8fd48d68cfe983e --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index b9e7c88..ebf3d16 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=42 + ro.vendor.build.svn=43 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From dea855285868b2895df4efe8d7811c78019015fb Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 23:41:50 +0000 Subject: [PATCH 21/26] Update panther SVN to 44 Bug: 313797924 Change-Id: I44a8706e5bd151c6a1df87d35933334140fbd777 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 43f0c2b..0287f29 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=43 + ro.vendor.build.svn=44 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 14a391f57f931590de11a6e223d6ca73a830c628 Mon Sep 17 00:00:00 2001 From: David Chen Date: Tue, 5 Dec 2023 06:58:02 +0000 Subject: [PATCH 22/26] Add zoom boost in powerhint for C10 and P10 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: 315102326 Change-Id: Iaa3e468b4732bea50f97b0e9678305a6a6f41263 --- powerhint-cheetah-a0.json | 12 ++++++++++++ powerhint-cheetah.json | 14 +++++++++++++- powerhint-panther-a0.json | 12 ++++++++++++ powerhint-panther.json | 14 +++++++++++++- 4 files changed, 50 insertions(+), 2 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index c98446c..0f8c182 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -1007,6 +1007,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", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 6a209c1..101b43e 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -362,7 +362,7 @@ "Values": [ "0", "1" - ], + ] }, { "Name": "DisplayWakeup", @@ -1131,6 +1131,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", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 5737a14..5a89a89 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -996,6 +996,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", "Node": "TAPreferHighCap", diff --git a/powerhint-panther.json b/powerhint-panther.json index 2141e41..a067b1a 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -342,7 +342,7 @@ "Values": [ "0", "1" - ], + ] }, { "Name": "DisplayWakeup", @@ -1089,6 +1089,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", "Node": "TAPreferHighCap", From a950f0aa8ac3cbe1f371c386ca45704f8dbf03a8 Mon Sep 17 00:00:00 2001 From: leohsieh Date: Mon, 11 Dec 2023 20:45:53 +0800 Subject: [PATCH 23/26] udfps: split trusty app to 24Q1 and trunk version fingerprint app -> firmware/fingerprint/[24Q1|trunk] Bug: 310904673 Change-Id: Idc63e53958a687cca3003deadcf4ae1e818fbff7 --- device-cheetah.mk | 5 +++++ device-panther.mk | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index c14d596..bfcec46 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -274,6 +274,11 @@ PRODUCT_SOONG_NAMESPACES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk +endif $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) diff --git a/device-panther.mk b/device-panther.mk index 03e1bfe..f8a2487 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -254,6 +254,11 @@ PRODUCT_SOONG_NAMESPACES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk +endif $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) From 5c5be2e60a8f71be416c991fb5d55effb2171fc9 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 23:44:55 +0000 Subject: [PATCH 24/26] Update cheetah SVN to 44 Bug: 313797924 Change-Id: I24beb8eadae4c9df3b633b6fbf1e0c243f1e9dd6 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index ebf3d16..d90574c 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=43 + ro.vendor.build.svn=44 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From dcd3d4207e4fc2675c846d229da9da6f2c2738f9 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Fri, 29 Sep 2023 15:37:49 -0700 Subject: [PATCH 25/26] thermal: PID tuning for 26 levels of chg_mdis Bug: 266625520 Test: verified by emul_temp Change-Id: I6e44ea99e6b350ede3763969b6c6a1769e06e86f --- thermal_info_config_charge_cheetah.json | 27 ++++++++++----------- thermal_info_config_charge_panther.json | 31 +++++++++++++------------ thermal_info_config_cheetah.json | 27 ++++++++++----------- thermal_info_config_panther.json | 31 +++++++++++++------------ 4 files changed, 60 insertions(+), 56 deletions(-) diff --git a/thermal_info_config_charge_cheetah.json b/thermal_info_config_charge_cheetah.json index 95724da..ca7e17a 100644 --- a/thermal_info_config_charge_cheetah.json +++ b/thermal_info_config_charge_cheetah.json @@ -46,26 +46,27 @@ "Combination":["qi_therm","quiet_therm"], "Coefficient":[0.35, 0.65], "Offset":-650, - "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 4.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 27, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"] + "I_Max":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2383, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 8022, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1383 }, "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0] + "PowerWeight": [0.21, 0.21, 0.21, 0.43, 0.43, 0.43, 0.43] } ], "BindedCdevInfo": [ @@ -74,8 +75,8 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 4, 7, 8, 9, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] } ] }, diff --git a/thermal_info_config_charge_panther.json b/thermal_info_config_charge_panther.json index b4be800..7ab7626 100644 --- a/thermal_info_config_charge_panther.json +++ b/thermal_info_config_charge_panther.json @@ -46,26 +46,27 @@ "Combination":["qi_therm", "quiet_therm"], "Coefficient":[0.282, 0.718], "Offset":-448, - "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 4.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"] + "I_Max":["NAN", "NAN", 1300, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2300, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 7600, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1300 }, "ExcludedPowerInfo": [ { - "PowerRail": "POWER_FOR_CHARGING_THROTTLING", - "PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0] + "PowerRail": "PARTIAL_SYSTEM_POWER", + "PowerWeight": [0.2, 0.2, 0.2, 0.4, 0.4, 0.4, 0.4] } ], "BindedCdevInfo": [ @@ -74,8 +75,8 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 4, 7, 8, 9, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] } ] }, @@ -182,7 +183,7 @@ "PowerSampleCount":1 }, { - "Name":"POWER_FOR_CHARGING_THROTTLING", + "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", "Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"], diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index a492fd2..aeba547 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -280,26 +280,27 @@ "Combination":["qi_therm","quiet_therm"], "Coefficient":[0.35, 0.65], "Offset":-650, - "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 4.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 27, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"] + "I_Max":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2383, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 8022, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1383 }, "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0] + "PowerWeight": [0.21, 0.21, 0.21, 0.43, 0.43, 0.43, 0.43] } ], "BindedCdevInfo": [ @@ -308,8 +309,8 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 4, 7, 8, 9, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] } ] }, diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index b786da2..553b33e 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -280,26 +280,27 @@ "Combination":["qi_therm", "quiet_therm"], "Coefficient":[0.282, 0.718], "Offset":-448, - "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 4.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"] + "I_Max":["NAN", "NAN", 1300, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2300, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 7600, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1300 }, "ExcludedPowerInfo": [ { - "PowerRail": "POWER_FOR_CHARGING_THROTTLING", - "PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0] + "PowerRail": "PARTIAL_SYSTEM_POWER", + "PowerWeight": [0.2, 0.2, 0.2, 0.4, 0.4, 0.4, 0.4] } ], "BindedCdevInfo": [ @@ -308,8 +309,8 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 4, 7, 8, 9, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] } ] }, @@ -826,7 +827,7 @@ "PowerSampleCount":1 }, { - "Name":"POWER_FOR_CHARGING_THROTTLING", + "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", "Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"], From 6c10bd721dab49692aa369452093c44c2f5804ed Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 13 Dec 2023 14:36:35 +0800 Subject: [PATCH 26/26] Branch bootloader prebuilts for 24Q2 release Bug: 313350495 Change-Id: Ia531c6512e8cef3c5d3081ee134b732232f1bc88 --- cheetah/BoardConfig.mk | 2 ++ cloudripper/BoardConfig.mk | 2 ++ device-cheetah.mk | 4 ++++ device-cloudripper.mk | 2 ++ device-panther.mk | 4 ++++ device-ravenclaw.mk | 4 ++++ panther/BoardConfig.mk | 2 ++ ravenclaw/BoardConfig.mk | 2 ++ 8 files changed, 22 insertions(+) diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index c5976fc..3cedf15 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -20,6 +20,8 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_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 diff --git a/cloudripper/BoardConfig.mk b/cloudripper/BoardConfig.mk index 0c97cee..c2dcfa0 100644 --- a/cloudripper/BoardConfig.mk +++ b/cloudripper/BoardConfig.mk @@ -17,6 +17,8 @@ TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := cloudripper 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 diff --git a/device-cheetah.mk b/device-cheetah.mk index 346df4e..f8e82fa 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -276,6 +276,8 @@ PRODUCT_SOONG_NAMESPACES += \ GOODIX_CONFIG_BUILD_VERSION := g7_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk endif @@ -296,6 +298,8 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk endif diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 0347420..5d30dee 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -157,6 +157,8 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk endif diff --git a/device-panther.mk b/device-panther.mk index b793f1b..c6f0794 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -256,6 +256,8 @@ PRODUCT_SOONG_NAMESPACES += \ GOODIX_CONFIG_BUILD_VERSION := g7_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk endif @@ -280,6 +282,8 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/panther/ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk endif diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 9906272..2dcc35c 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -147,6 +147,8 @@ PRODUCT_SOONG_NAMESPACES += \ GOODIX_CONFIG_BUILD_VERSION := g6_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk endif @@ -168,6 +170,8 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk endif diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk index d985330..81f4438 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -23,6 +23,8 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_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 diff --git a/ravenclaw/BoardConfig.mk b/ravenclaw/BoardConfig.mk index a724a26..8fc4e6a 100644 --- a/ravenclaw/BoardConfig.mk +++ b/ravenclaw/BoardConfig.mk @@ -17,6 +17,8 @@ TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := ravenclaw 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