From fb1be101b08e5b9fae356dd6631fa65fa18056d5 Mon Sep 17 00:00:00 2001
From: shihchienc <shihchienc@google.com>
Date: Mon, 22 May 2023 06:17:48 +0000
Subject: [PATCH 1/2] Enable superwide band system property

As the change of init feature flag on swb is ready, we will open
swb on those devices that supports this feature with more flexibility
since wiping sys property could be done at android regular releases
as enabling feature flag on server make it more flexible on schedule.

Test: manual
Bug: 283722412
Change-Id: If015fd92b5c75a07bb0820f54dc413a32031f6ea
---
 device-husky.mk      | 2 +-
 device-ripcurrent.mk | 2 +-
 device-shiba.mk      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/device-husky.mk b/device-husky.mk
index 6f582b4..6af7838 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -144,7 +144,7 @@ PRODUCT_PACKAGES += \
 
 # Bluetooth Super Wide Band
 PRODUCT_PRODUCT_PROPERTIES += \
-	bluetooth.hfp.swb.supported=false
+	bluetooth.hfp.swb.supported=true
 
 # Bluetooth LE Audio
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk
index 6aa66be..0a1fd2b 100644
--- a/device-ripcurrent.mk
+++ b/device-ripcurrent.mk
@@ -140,7 +140,7 @@ PRODUCT_PACKAGES += \
 
 # Bluetooth Super Wide Band
 PRODUCT_PRODUCT_PROPERTIES += \
-	bluetooth.hfp.swb.supported=false
+	bluetooth.hfp.swb.supported=true
 
 # Bluetooth LE Audio
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-shiba.mk b/device-shiba.mk
index da1d33e..b68f500 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -130,7 +130,7 @@ PRODUCT_PACKAGES += \
 
 # Bluetooth Super Wide Band
 PRODUCT_PRODUCT_PROPERTIES += \
-	bluetooth.hfp.swb.supported=false
+	bluetooth.hfp.swb.supported=true
 
 # Bluetooth LE Audio
 PRODUCT_PRODUCT_PROPERTIES += \

From 439f08b51687e8d6b5079188244dfd0bd81b9bd3 Mon Sep 17 00:00:00 2001
From: Yvonne Yip <ykyyip@google.com>
Date: Wed, 31 May 2023 11:51:05 -0700
Subject: [PATCH 2/2] powerhint: Fix down_rate_limit hints for shiba

Bug: b/283319548
Test: Boot and check trace from display inactive to active

Change-Id: I564c17042c4877deed4c3d29ad696a0d8a74611b
---
 perf/powerhint-shiba.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index e9e610f..7d14c55 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -859,19 +859,19 @@
     {
       "PowerHint": "DISPLAY_INACTIVE",
       "Node": "CPULittleClusterDownRateLimitUs",
-      "Duration": 50,
+      "Duration": 0,
       "Value": "500"
     },
     {
       "PowerHint": "DISPLAY_INACTIVE",
       "Node": "CPUMidClusterDownRateLimitUs",
-      "Duration": 50,
+      "Duration": 0,
       "Value": "500"
     },
     {
       "PowerHint": "DISPLAY_INACTIVE",
       "Node": "CPUBigClusterDownRateLimitUs",
-      "Duration": 50,
+      "Duration": 0,
       "Value": "500"
     },
     {
@@ -2011,19 +2011,19 @@
     {
       "PowerHint": "DISPLAY_UPDATE_IMMINENT",
       "Node": "CPULittleClusterDownRateLimitUs",
-      "Duration": 0,
+      "Duration": 50,
       "Value": "5000"
     },
     {
       "PowerHint": "DISPLAY_UPDATE_IMMINENT",
       "Node": "CPUMidClusterDownRateLimitUs",
-      "Duration": 0,
+      "Duration": 50,
       "Value": "20000"
     },
     {
       "PowerHint": "DISPLAY_UPDATE_IMMINENT",
       "Node": "CPUBigClusterDownRateLimitUs",
-      "Duration": 0,
+      "Duration": 50,
       "Value": "20000"
     },
     {