From c49f3a5968ae39dcb0d0e317d5253a0615ac67f9 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:14:12 +0000 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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 += \