From 5f2c8a23f49b10f5ef450588a691c2af3a0f6b41 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 7 Nov 2023 03:22:38 +0000 Subject: [PATCH 01/17] Update shiba SVN to 7 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3a07bc24981bf07d5f41508ed921ea3041040293) Merged-In: Ib7c2f7a5b0c482fcce6f58fb4ff172a5bb8081a0 Change-Id: Ib7c2f7a5b0c482fcce6f58fb4ff172a5bb8081a0 --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index e523ae0..55b39d1 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -333,7 +333,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=6 + ro.vendor.build.svn=7 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From 3f110ee09547ffbb63be6a7c2e497b334518eeae Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 7 Nov 2023 03:30:44 +0000 Subject: [PATCH 02/17] Update husky SVN to 7 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:baac78e02baa9f6b3c83dbe3a874996ff1f87762) Merged-In: Ia41e0f55fe84257d91f99322b013024efea970ec Change-Id: Ia41e0f55fe84257d91f99322b013024efea970ec --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 7ef9b87..a837c28 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -352,7 +352,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=6 + ro.vendor.build.svn=7 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From db0be3052bc68021e6eee875b3ac446d051b50ff Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 7 Nov 2023 03:22:38 +0000 Subject: [PATCH 03/17] Update shiba SVN to 7 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3a07bc24981bf07d5f41508ed921ea3041040293) Merged-In: Ib7c2f7a5b0c482fcce6f58fb4ff172a5bb8081a0 Change-Id: Ib7c2f7a5b0c482fcce6f58fb4ff172a5bb8081a0 --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index e523ae0..55b39d1 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -333,7 +333,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=6 + ro.vendor.build.svn=7 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From f9c57a4189c7607cdbf6810a7d1cbef6bcc2e5e8 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 7 Nov 2023 03:30:44 +0000 Subject: [PATCH 04/17] Update husky SVN to 7 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:baac78e02baa9f6b3c83dbe3a874996ff1f87762) Merged-In: Ia41e0f55fe84257d91f99322b013024efea970ec Change-Id: Ia41e0f55fe84257d91f99322b013024efea970ec --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 7ef9b87..a837c28 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -352,7 +352,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=6 + ro.vendor.build.svn=7 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From b10f0099680d57e4c8261d7259bd22e41708d5ae Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Sat, 11 Nov 2023 02:34:18 +0000 Subject: [PATCH 05/17] Update shiba SVN to 8 Bug: 309529736 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:94530707beccc638bb5c9059d9eb49ff62c82a82) Merged-In: I52cf74012b91a31315c24c8c3a67e5744f8ca3be Change-Id: I52cf74012b91a31315c24c8c3a67e5744f8ca3be --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 55b39d1..21fe320 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -333,7 +333,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=7 + ro.vendor.build.svn=8 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From 0237f1d45b6dd96d4e9e54124b0225f42e147ed7 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Sat, 11 Nov 2023 03:04:51 +0000 Subject: [PATCH 06/17] Update husky SVN to 8 Bug: 309529736 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3e95ecd2dde420d24128b3ceba9ef955f1bcdcae) Merged-In: I025214556cc8e6f9b4bd61dbc1854bff207b4016 Change-Id: I025214556cc8e6f9b4bd61dbc1854bff207b4016 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index a837c28..2b66f77 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -352,7 +352,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=7 + ro.vendor.build.svn=8 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From ed2031fc480eec7d1b7485b177938b3472cad478 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Sat, 11 Nov 2023 03:07:14 +0000 Subject: [PATCH 07/17] Update husky SVN to 9 Bug: 309529736 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b1962b4339a3d169cc6eb4a218712ef130173b3b) Merged-In: Idf6bcb27b9f72f4eecbdf313372268ab18053865 Change-Id: Idf6bcb27b9f72f4eecbdf313372268ab18053865 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 2b66f77..ecdc046 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -352,7 +352,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=8 + ro.vendor.build.svn=9 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From ec1acb44afef72c73cc1b6089d287700abc71310 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Sat, 11 Nov 2023 02:55:00 +0000 Subject: [PATCH 08/17] Update shiba SVN to 9 Bug: 309529736 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:acdb02e9aaae24bb5b1f7e8086cb4dbf7b8db0db) Merged-In: I737a6cbdbbf372c64168019a7f085f3b531d252e Change-Id: I737a6cbdbbf372c64168019a7f085f3b531d252e --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 21fe320..070cadd 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -333,7 +333,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=8 + ro.vendor.build.svn=9 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From 2b540565f5f3835b9672f5a9bc326a47a8d7aeea Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Sat, 11 Nov 2023 03:07:14 +0000 Subject: [PATCH 09/17] Update husky SVN to 9 Bug: 309529736 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b1962b4339a3d169cc6eb4a218712ef130173b3b) Merged-In: Idf6bcb27b9f72f4eecbdf313372268ab18053865 Change-Id: Idf6bcb27b9f72f4eecbdf313372268ab18053865 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 2b66f77..ecdc046 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -352,7 +352,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=8 + ro.vendor.build.svn=9 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From 78faabd3796f060e0a8845dd6902c80468bd352b Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Sat, 11 Nov 2023 02:55:00 +0000 Subject: [PATCH 10/17] Update shiba SVN to 9 Bug: 309529736 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:acdb02e9aaae24bb5b1f7e8086cb4dbf7b8db0db) Merged-In: I737a6cbdbbf372c64168019a7f085f3b531d252e Change-Id: I737a6cbdbbf372c64168019a7f085f3b531d252e --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 21fe320..070cadd 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -333,7 +333,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=8 + ro.vendor.build.svn=9 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From 6ddb782cc5be5bd9c90684f2eccfedca39bcdeef Mon Sep 17 00:00:00 2001 From: Weichin Weng Date: Tue, 28 Nov 2023 03:26:27 +0000 Subject: [PATCH 11/17] Revert "Enable Bluetooth CHRE feature on bt_vendor.conf" This reverts commit dbc0ad4d25e01f8d6a170ba2f93d705b709674be. Reason for revert: Revert by request b/298141323#comment32 Bug: 298141323 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e211cf7913337f5d05a96e0ea539b7f31557a1a6) Merged-In: I12e3fabd29fd482b4658db9b875db20d05d62086 Change-Id: I12e3fabd29fd482b4658db9b875db20d05d62086 --- bluetooth/bt_vendor_overlay.conf | 3 --- bluetooth/bt_vendor_overlay_ripcurrent.conf | 3 --- 2 files changed, 6 deletions(-) diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf index 82f1e65..765e60f 100644 --- a/bluetooth/bt_vendor_overlay.conf +++ b/bluetooth/bt_vendor_overlay.conf @@ -3,9 +3,6 @@ # Uart port name UartPort = /dev/ttySAC18 -# Userial type -UserialType = 2 - # Enable check whether let aoc controls power pin AocPowerPinCtrlCheckEnable = true diff --git a/bluetooth/bt_vendor_overlay_ripcurrent.conf b/bluetooth/bt_vendor_overlay_ripcurrent.conf index a4a91d5..2473a1b 100644 --- a/bluetooth/bt_vendor_overlay_ripcurrent.conf +++ b/bluetooth/bt_vendor_overlay_ripcurrent.conf @@ -3,9 +3,6 @@ # Uart port name UartPort = /dev/ttySAC18 -# Userial type -UserialType = 2 - # Sar backOff high resolution support SarBackOffHighResolution = true From f1df825db12a6610069d6be31a7ac572ecf9c111 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Sat, 11 Nov 2023 03:07:14 +0000 Subject: [PATCH 12/17] Update husky SVN to 9 Bug: 309529736 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b1962b4339a3d169cc6eb4a218712ef130173b3b) Merged-In: Idf6bcb27b9f72f4eecbdf313372268ab18053865 Change-Id: Idf6bcb27b9f72f4eecbdf313372268ab18053865 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 2b66f77..ecdc046 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -352,7 +352,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=8 + ro.vendor.build.svn=9 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From 93b7df63c571ead83da958119ee8033ea1d2f0a4 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Sat, 11 Nov 2023 02:55:00 +0000 Subject: [PATCH 13/17] Update shiba SVN to 9 Bug: 309529736 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:acdb02e9aaae24bb5b1f7e8086cb4dbf7b8db0db) Merged-In: I737a6cbdbbf372c64168019a7f085f3b531d252e Change-Id: I737a6cbdbbf372c64168019a7f085f3b531d252e --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 21fe320..070cadd 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -333,7 +333,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=8 + ro.vendor.build.svn=9 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From d9dc5e4d0258e86da5b27302ed100accf0373ef1 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Sat, 11 Nov 2023 03:07:14 +0000 Subject: [PATCH 14/17] Update husky SVN to 9 Bug: 309529736 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b1962b4339a3d169cc6eb4a218712ef130173b3b) Merged-In: Idf6bcb27b9f72f4eecbdf313372268ab18053865 Change-Id: Idf6bcb27b9f72f4eecbdf313372268ab18053865 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 2b66f77..ecdc046 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -352,7 +352,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=8 + ro.vendor.build.svn=9 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From fe0f8d1a8cba250e64a1f7f2e900599a1e248f3c Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Sat, 11 Nov 2023 02:55:00 +0000 Subject: [PATCH 15/17] Update shiba SVN to 9 Bug: 309529736 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:acdb02e9aaae24bb5b1f7e8086cb4dbf7b8db0db) Merged-In: I737a6cbdbbf372c64168019a7f085f3b531d252e Change-Id: I737a6cbdbbf372c64168019a7f085f3b531d252e --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 21fe320..070cadd 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -333,7 +333,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=8 + ro.vendor.build.svn=9 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From 935eb4bc4209672fe108452df3d1988f84335548 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 06:42:46 +0000 Subject: [PATCH 16/17] Update shiba SVN to 10 Bug: 313696499 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:db101e499a7e7142fd9e4927e53a3352683ebfdd) Merged-In: Id343a68986f11b2348343666d537d73939f17516 Change-Id: Id343a68986f11b2348343666d537d73939f17516 --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 070cadd..fb52a60 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -333,7 +333,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=9 + ro.vendor.build.svn=10 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From bdd9876bbb39cb6ab4dfea8a9d7b76cd834baebe Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 06:48:37 +0000 Subject: [PATCH 17/17] Update husky SVN to 10 Bug: 313696499 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8310d49d5176237c7f8d99c94915d6796f77ab10) Merged-In: I7b6bd17cccd6fb31177b8ecdf72ab6096373f6b0 Change-Id: I7b6bd17cccd6fb31177b8ecdf72ab6096373f6b0 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index ecdc046..a0ee778 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -352,7 +352,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=9 + ro.vendor.build.svn=10 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))