From df71f96653462c41c54a4c06df44169c6debe16e Mon Sep 17 00:00:00 2001 From: Hana Huang Date: Fri, 12 Jul 2024 05:57:06 +0000 Subject: [PATCH 01/18] Wifi: Disable config_wifiEnableStaIndoorChannelForPeerNetwork Bug: 351981809 Bug: 352658713 Test: AU drop/IFS/RvR/CTS/VTS/Manual Test, JP SAP indoor channel test Signed-off-by: Hana Huang (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:37b036a0ed8b956f77589654c3748ee6fbacedd1) Merged-In: If2d46e2bbd7612e6cc6f80bc74c7870dea17e08d Change-Id: If2d46e2bbd7612e6cc6f80bc74c7870dea17e08d --- rro_overlays/WifiOverlay/res/values/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml index 61a2e7f..6519607 100644 --- a/rro_overlays/WifiOverlay/res/values/config.xml +++ b/rro_overlays/WifiOverlay/res/values/config.xml @@ -152,7 +152,7 @@ - true + false true From 79c7ddf92e9b414f0ea7f5d21f4b1698eb3d05da Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 30 May 2024 00:09:10 +0000 Subject: [PATCH 02/18] Update husky SVN to 28 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1fd7be6ff6a4b00b907c7ef5096869938075e882) Merged-In: Iebe683d60093eecbf7aa8fb417c390e5180abfc9 Change-Id: Iebe683d60093eecbf7aa8fb417c390e5180abfc9 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 8e123ae..5f5c9bc 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -396,7 +396,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=27 + ro.vendor.build.svn=28 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From ae4c7015aee5e453d4318a53827d3c3516b0a4d3 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 30 May 2024 00:07:15 +0000 Subject: [PATCH 03/18] Update shiba SVN to 28 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dbbeb5592d7bcd71e20e50422375e7dbe4e3612d) Merged-In: Ib715c678925f017ef61b90b5331a705745ccd7ef Change-Id: Ib715c678925f017ef61b90b5331a705745ccd7ef --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 8da0637..268c78b 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -373,7 +373,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=27 + ro.vendor.build.svn=28 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From baca27309910ea98fbbc8ebd82d2ed77dbe306a9 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 31 May 2024 18:20:52 +0000 Subject: [PATCH 04/18] Update husky SVN to 29 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a7d44dbb505092e6b99126ff5feb96cce9b8404c) Merged-In: I984a575909fd74ba78148bf39b5a109ecbf7bc3f Change-Id: I984a575909fd74ba78148bf39b5a109ecbf7bc3f --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 5f5c9bc..f199bd0 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -396,7 +396,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=28 + ro.vendor.build.svn=29 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From 255c9897da6c133c09b206e6006b6cdf3c360de5 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 31 May 2024 18:22:16 +0000 Subject: [PATCH 05/18] Update shiba SVN to 29 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d650a1559a58ababa3feaaea2a44e4b4f81f829a) Merged-In: Ie294dbfad34544b20386d019edf8d24819aa1f6d Change-Id: Ie294dbfad34544b20386d019edf8d24819aa1f6d --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 268c78b..3037f30 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -373,7 +373,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=28 + ro.vendor.build.svn=29 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From 17bf01d638ade0592ebb5dfc1f39c236df90633e Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:08:32 +0000 Subject: [PATCH 06/18] Update shiba SVN to 30 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b085ae1f72b6821c4f6e2bbf0e741148775346d8) Merged-In: I2ef29057958ba6e31c76973de70d69577c1befe5 Change-Id: I2ef29057958ba6e31c76973de70d69577c1befe5 --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 3037f30..498b52c 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -373,7 +373,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=29 + ro.vendor.build.svn=30 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From 815dfea454b8e6a9bd1bdfbfe9a754127a283efe Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:10:47 +0000 Subject: [PATCH 07/18] Update shiba SVN to 31 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:98ed4cdd4eb4b4e8deb094478a8a351bea7a6cdc) Merged-In: I2f0f9681455968cdaed4a74d3a77c0b2de1ba14b Change-Id: I2f0f9681455968cdaed4a74d3a77c0b2de1ba14b --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 498b52c..da87077 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -373,7 +373,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=30 + ro.vendor.build.svn=31 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From 8d8b1021fa91fa0a64f90a87acf9d01b6842fb22 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:15:27 +0000 Subject: [PATCH 08/18] Update husky SVN to 30 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a7b24379b54da71b59da2c80dc3ede5ce83beafd) Merged-In: Icdbc5cd31dbca584589f703c16aa18698f7de294 Change-Id: Icdbc5cd31dbca584589f703c16aa18698f7de294 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index f199bd0..e938c1b 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -396,7 +396,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=29 + ro.vendor.build.svn=30 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From 5e9345a0e75da69aba034157a05d0eafda1513c3 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:13:33 +0000 Subject: [PATCH 09/18] Update shiba SVN to 32 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d3e5bfd7a40cb6652407777caadb206c07171cf8) Merged-In: I18527bb9a4358c14b2e99646670f0ab2da8173f0 Change-Id: I18527bb9a4358c14b2e99646670f0ab2da8173f0 --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index da87077..4965a07 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -373,7 +373,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=31 + ro.vendor.build.svn=32 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From f92416d65f51e4b9f23fc4136348764a771b97b9 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:17:07 +0000 Subject: [PATCH 10/18] Update husky SVN to 31 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:810570db667f583164ab6af56df0ecbe9756b1d6) Merged-In: I2bdfbbed0dff3c3c093dd46200f2d8ce15c28652 Change-Id: I2bdfbbed0dff3c3c093dd46200f2d8ce15c28652 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index e938c1b..5b6070e 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -396,7 +396,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=30 + ro.vendor.build.svn=31 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From 3555945dd0e4bddc87b59aeef6b5b17bd662428b Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 5 Jun 2024 20:18:42 +0000 Subject: [PATCH 11/18] Update husky SVN to 32 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fe6c3b8adfa981b440aaf8250b633ca5db4de643) Merged-In: Icb9de546d095ed4d97e52cc32c1b034856ccd6fb Change-Id: Icb9de546d095ed4d97e52cc32c1b034856ccd6fb --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 5b6070e..aad692e 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -396,7 +396,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=31 + ro.vendor.build.svn=32 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From 4ef15ac1596dd6c5f4119892077c3bd41b6c5d61 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 3 Apr 2024 18:57:52 +0000 Subject: [PATCH 12/18] shusky: Use build_flags for SVN Flag: build.RELEASE_SVN_HUSKY Flag: build.RELEASE_SVN_SHIBA Bug: 332726030 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9c0b973e012e8a0de9b3094a573b2eeff93f0743) Merged-In: I289ffb153c91536c3d505dba3efe6b9096dbad50 Change-Id: I289ffb153c91536c3d505dba3efe6b9096dbad50 --- device-husky.mk | 9 ++++++++- device-shiba.mk | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index aad692e..0c180c3 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -395,8 +395,15 @@ PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.vibrator.hal.pm.activetimeout=5 # Increment the SVN for any official public releases +ifdef RELEASE_SVN_HUSKY +TARGET_SVN ?= $(RELEASE_SVN_HUSKY) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 32 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=32 + ro.vendor.build.svn=$(TARGET_SVN) # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/device-shiba.mk b/device-shiba.mk index 4965a07..942ec14 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -372,8 +372,15 @@ PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.vibrator.hal.pm.activetimeout=5 # Increment the SVN for any official public releases +ifdef RELEASE_SVN_SHIBA +TARGET_SVN ?= $(RELEASE_SVN_SHIBA) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 32 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=32 + ro.vendor.build.svn=$(TARGET_SVN) # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From 2d20fffe253954764bf46087b0a112049d214ef2 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 14:41:20 +0000 Subject: [PATCH 13/18] Update husky SVN to 33 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4b4f16c266ad592ed13c50202ce690c939410cdd) Merged-In: I9beeef1b118a8d8a05ea14072e211d2f25eaf164 Change-Id: I9beeef1b118a8d8a05ea14072e211d2f25eaf164 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 0c180c3..98de082 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -399,7 +399,7 @@ ifdef RELEASE_SVN_HUSKY TARGET_SVN ?= $(RELEASE_SVN_HUSKY) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 32 +TARGET_SVN ?= 33 endif PRODUCT_VENDOR_PROPERTIES += \ From d5e1cb35672ed505697a90ebb2289765b825ad05 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 14:43:18 +0000 Subject: [PATCH 14/18] Update husky SVN to 34 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c473353c4c58c6d178bedfec15d4d53595b941d5) Merged-In: Ieb8ec0e93b463e95787a3ceed0ed4cddf78b262a Change-Id: Ieb8ec0e93b463e95787a3ceed0ed4cddf78b262a --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 98de082..11893ce 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -399,7 +399,7 @@ ifdef RELEASE_SVN_HUSKY TARGET_SVN ?= $(RELEASE_SVN_HUSKY) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 33 +TARGET_SVN ?= 34 endif PRODUCT_VENDOR_PROPERTIES += \ From 0cf0f973f55890ea2a417a85b91b6b25bde4b6d6 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 14:21:17 +0000 Subject: [PATCH 15/18] Update shiba SVN to 33 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d9fa747d2582f885232423a464786d838d11b81a) Merged-In: I4ad3b7e298cf6ec12e2cfc8873a24492fd5c25df Change-Id: I4ad3b7e298cf6ec12e2cfc8873a24492fd5c25df --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 942ec14..7c64ca0 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -376,7 +376,7 @@ ifdef RELEASE_SVN_SHIBA TARGET_SVN ?= $(RELEASE_SVN_SHIBA) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 32 +TARGET_SVN ?= 33 endif PRODUCT_VENDOR_PROPERTIES += \ From 4d3c5858ead940b846bd054cf5fa7122aa6ed6d3 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 14:37:46 +0000 Subject: [PATCH 16/18] Update shiba SVN to 34 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a1e3e6cce330644fffac42cc04e7e607be88efa2) Merged-In: I9c7a9f6da772ecee70b9022aa29e8a3ad0d130d4 Change-Id: I9c7a9f6da772ecee70b9022aa29e8a3ad0d130d4 --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 7c64ca0..e23ca0a 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -376,7 +376,7 @@ ifdef RELEASE_SVN_SHIBA TARGET_SVN ?= $(RELEASE_SVN_SHIBA) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 33 +TARGET_SVN ?= 34 endif PRODUCT_VENDOR_PROPERTIES += \ From 63a206f38c5dd267c320b3a3d9f1c2963e4b8116 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 14:39:27 +0000 Subject: [PATCH 17/18] Update shiba SVN to 35 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:633317c02cf441e3fc03151ed15ecb72bd29fd98) Merged-In: Ib5c55167cdc0bbae64e48adb6778c445a38e5cc1 Change-Id: Ib5c55167cdc0bbae64e48adb6778c445a38e5cc1 --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index e23ca0a..eadaa37 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -376,7 +376,7 @@ ifdef RELEASE_SVN_SHIBA TARGET_SVN ?= $(RELEASE_SVN_SHIBA) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 34 +TARGET_SVN ?= 35 endif PRODUCT_VENDOR_PROPERTIES += \ From a9cd72541f4291f58054d9f1832255a2ada743d6 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 14:46:05 +0000 Subject: [PATCH 18/18] Update husky SVN to 35 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f5bb7a3f5605d94f482aeb7a50b842eb2e9a1942) Merged-In: I661546ae0ab104021936acd109e08de2a64a1b1c Change-Id: I661546ae0ab104021936acd109e08de2a64a1b1c --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 11893ce..f1aec80 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -399,7 +399,7 @@ ifdef RELEASE_SVN_HUSKY TARGET_SVN ?= $(RELEASE_SVN_HUSKY) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 34 +TARGET_SVN ?= 35 endif PRODUCT_VENDOR_PROPERTIES += \