From 0446d9c258a87a3ea3edf5f9953336910dca10fb Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Mon, 14 Aug 2023 22:11:01 +0000 Subject: [PATCH 1/9] Revert "Removing faceauth configs" Revert submission 24039435-cherrypick-FaceHAL-deprecate-raven-yon2bm08mmg Reason for revert: Droidfood blocking bug b/295449925 Reverted changes: /q/submissionid:24039435-cherrypick-FaceHAL-deprecate-raven-yon2bm08mmg (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:91934a32db19ea060453b610e47c493459e70d33) Merged-In: Iabd85576568ce66718e625607aa0d31dc8b357cc Change-Id: Iabd85576568ce66718e625607aa0d31dc8b357cc --- conf/init.raven.rc | 4 ++++ raven/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 2 files changed, 7 insertions(+) diff --git a/conf/init.raven.rc b/conf/init.raven.rc index 4d35ee1..5153c58 100644 --- a/conf/init.raven.rc +++ b/conf/init.raven.rc @@ -11,6 +11,10 @@ on init # Power Stats HAL chown system system /sys/devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power_stats +on fs + # Face + exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/faceauth.app + on property:vendor.mfgapi.touchpanel.permission=1 chmod 0600 /sys/devices/virtual/sec/tsp/cmd chown system system /sys/devices/virtual/sec/tsp/cmd diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index 4c636d8..c8d8730 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -197,6 +197,9 @@ 145px 28dp + + false + 2 3 From 9ba93d0cedeca37b2fe2e8e3271c6d0f4837492f Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Mon, 14 Aug 2023 22:11:01 +0000 Subject: [PATCH 2/9] Revert "Removing faceauth configs" Revert submission 24039435-cherrypick-FaceHAL-deprecate-raven-yon2bm08mmg Reason for revert: Droidfood blocking bug b/295449925 Reverted changes: /q/submissionid:24039435-cherrypick-FaceHAL-deprecate-raven-yon2bm08mmg (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:91934a32db19ea060453b610e47c493459e70d33) Merged-In: Iabd85576568ce66718e625607aa0d31dc8b357cc Change-Id: Iabd85576568ce66718e625607aa0d31dc8b357cc --- conf/init.raven.rc | 4 ++++ raven/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 2 files changed, 7 insertions(+) diff --git a/conf/init.raven.rc b/conf/init.raven.rc index 4d35ee1..5153c58 100644 --- a/conf/init.raven.rc +++ b/conf/init.raven.rc @@ -11,6 +11,10 @@ on init # Power Stats HAL chown system system /sys/devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power_stats +on fs + # Face + exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/faceauth.app + on property:vendor.mfgapi.touchpanel.permission=1 chmod 0600 /sys/devices/virtual/sec/tsp/cmd chown system system /sys/devices/virtual/sec/tsp/cmd diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index 4c636d8..c8d8730 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -197,6 +197,9 @@ 145px 28dp + + false + 2 3 From 5ace8cee54d0a3ce4617aaec7ba88a2d60af5bc7 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:13:52 +0000 Subject: [PATCH 3/9] Update raven SVN to 71 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ed76e2420dfa185be32015c8c22d20cb58e1ced2) Merged-In: I8c74f60d0c0437585a1f4bf5ad9d43115ddcc8b1 Change-Id: I8c74f60d0c0437585a1f4bf5ad9d43115ddcc8b1 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 8d198ba..bb20cab 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -186,7 +186,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=70 + ro.vendor.build.svn=71 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From dbd5573846c1d52a2b37eb58e5b895b01260f343 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:20 +0000 Subject: [PATCH 4/9] Update oriole SVN to 71 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:afe27a01390a08b9904130e5eca9f554e5007b4d) Merged-In: If51fdd784e6f45e63331ce984e76632e2236a943 Change-Id: If51fdd784e6f45e63331ce984e76632e2236a943 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index fbf3702..7075e01 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=70 + ro.vendor.build.svn=71 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 4f5896c20a72f963723d162689cfece07e29972c Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:26 +0000 Subject: [PATCH 5/9] Update raven SVN to 72 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c56cc1ffe2b692a70f0a9d4037f00543794c3817) Merged-In: I0d77e8c5e8878196f73fc0cb86406e0ff2bceecc Change-Id: I0d77e8c5e8878196f73fc0cb86406e0ff2bceecc --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index bb20cab..0833143 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -186,7 +186,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=71 + ro.vendor.build.svn=72 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From f055b6ff8f199c7ac242100f60ff4fa3fb63fe28 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:42:52 +0000 Subject: [PATCH 6/9] Update oriole SVN to 72 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:de8cd7d5e9611936c024988558237a12b4fda36f) Merged-In: I8dd3b2389683050f017bbc09946bce8a14e979e8 Change-Id: I8dd3b2389683050f017bbc09946bce8a14e979e8 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 7075e01..70f0b37 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=71 + ro.vendor.build.svn=72 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 68b4cb6227500257bcfffd967ec35cdfd7b7b757 Mon Sep 17 00:00:00 2001 From: Shivakumar Neginal Date: Mon, 16 Oct 2023 18:53:29 +0000 Subject: [PATCH 7/9] Adding Fast Pair extended IDs for Pixel 6 Adding the Fast Pair extended IDs for oriole and raven so that Quick Start shows the right Fast Pair bottom sheet on other devices during setup. Bug: 305516133 Test: Manually flashed a oriole & raven device and validated the FP bottom sheet is displayed on a nearby other device (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4fb3e74540a7be3badfc73f553cfb4b5d960dc5c) Merged-In: Iba09888de27f92e16ab0979a7d62e9a7c6505ff2 Change-Id: Iba09888de27f92e16ab0979a7d62e9a7c6505ff2 --- device-oriole.mk | 5 +++++ device-raven.mk | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 70f0b37..c6ae0ed 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -280,3 +280,8 @@ endif # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true + +# Quick Start device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + ro.quick_start.oem_id=00e0 \ + ro.quick_start.device_id=oriole diff --git a/device-raven.mk b/device-raven.mk index 0833143..faf89b1 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -291,3 +291,7 @@ endif # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true +# Quick Start device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + ro.quick_start.oem_id=00e0 \ + ro.quick_start.device_id=raven From d9627e21f187a8e231f11e90dfb1e2b0a5d4f918 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 26 Oct 2023 05:07:47 +0000 Subject: [PATCH 8/9] Update raven SVN to 73 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6715a1002e4b73f62a1e233234a857e4ea5dcf61) Merged-In: Ie036112a3c0890629e5169991dc76c0407705b39 Change-Id: Ie036112a3c0890629e5169991dc76c0407705b39 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index faf89b1..6a2f758 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -186,7 +186,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=72 + ro.vendor.build.svn=73 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 1e51c14cff850f719660ebb66be81e78937e724a Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 26 Oct 2023 04:57:37 +0000 Subject: [PATCH 9/9] Update oriole SVN to 73 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0240e9137174abd21bcec6332f6a3e959437ac23) Merged-In: Ib2893f0b721498f7c2b71377e79123765afd164f Change-Id: Ib2893f0b721498f7c2b71377e79123765afd164f --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index c6ae0ed..a260d2d 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=72 + ro.vendor.build.svn=73 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \