From 42c1ef10d5fbaed7d3e166b1b9319d1fac2f1c8c Mon Sep 17 00:00:00 2001
From: Victor Liu <victorliu@google.com>
Date: Thu, 1 Sep 2022 21:39:19 +0000
Subject: [PATCH 1/2] Revert "uwb: update vendor hal folder location"

Revert "uwb: update vendor hal folder location"

Revert "uwb: update vendor hal folder location"

Revert "uwb: update vendor hal folder location"

Revert "uwb: move uwb hal into dw3000-hal folder"

Revert "uwb: update vendor hal folder location"

Revert submission 19786107-241468038

Reason for revert: b/244619620 - This change will cause automerger conflicts and should go into tm-qpr-dev since tm-qpr-dev is still actively being used.
Reverted Changes:
I6c84b59fe:uwb: update vendor hal folder location
If64da8254:uwb: update vendor hal folder location
Ie3a507f22:uwb: update vendor hal folder location
Ib5c22ea7e:uwb: move uwb hal into dw3000-hal folder
Id48f26750:uwb: update vendor hal folder location
I1a05fe35f:uwb: update vendor hal folder location

Change-Id: I26e42a47448675ecfb0b5be79fa1a527d1955912
---
 uwb/uwb_calibration.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk
index 0660f86..3889a08 100644
--- a/uwb/uwb_calibration.mk
+++ b/uwb/uwb_calibration.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # UWB - ultra wide band
-$(call inherit-product-if-exists, vendor/qorvo/uwb/dw3000-hal/uwb.mk)
+$(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk)
 
 LOCAL_UWB_CAL_DIR=device/google/raviole/uwb
 

From 493ca504256e0a884b2f81b428342d2c71d1fe04 Mon Sep 17 00:00:00 2001
From: Rick Yiu <rickyiu@google.com>
Date: Thu, 18 Aug 2022 03:16:52 +0000
Subject: [PATCH 2/2] Remove RestrictedCpuset hint

With systemui now changed its cpuset in early stage, we no longer
need RestrictedCpuset hint as workaround.

Bug: 242775562
Test: build pass
Change-Id: If041b589a9df7de0a932df59ee3436adcb449fd9
---
 powerhint-oriole.json | 21 ---------------------
 powerhint-raven.json  | 21 ---------------------
 2 files changed, 42 deletions(-)

diff --git a/powerhint-oriole.json b/powerhint-oriole.json
index c21ee8c..6114e8a 100644
--- a/powerhint-oriole.json
+++ b/powerhint-oriole.json
@@ -212,15 +212,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "RestrictedCpuset",
-      "Path": "/dev/cpuset/restricted/cpus",
-      "Values": [
-        "0-3",
-        "0-7"
-      ],
-      "ResetOnInit": false
-    },
     {
       "Name": "CDHighCpusetCpus",
       "Path": "/dev/cpuset/camera-daemon-high-group/cpus",
@@ -1783,18 +1774,6 @@
       "Node": "PMQoSCpuDmaLatency",
       "Duration": 2000,
       "Value": "44"
-    },
-    {
-      "PowerHint": "DEVICE_IDLE",
-      "Node": "RestrictedCpuset",
-      "Duration": 0,
-      "Value": "0-3"
-    },
-    {
-      "PowerHint": "DISPLAY_INACTIVE",
-      "Node": "RestrictedCpuset",
-      "Duration": 0,
-      "Value": "0-3"
     }
   ],
   "AdpfConfig": [
diff --git a/powerhint-raven.json b/powerhint-raven.json
index 64bc60a..18d1324 100644
--- a/powerhint-raven.json
+++ b/powerhint-raven.json
@@ -211,15 +211,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "RestrictedCpuset",
-      "Path": "/dev/cpuset/restricted/cpus",
-      "Values": [
-        "0-3",
-        "0-7"
-      ],
-      "ResetOnInit": false
-    },
     {
       "Name": "CDHighCpusetCpus",
       "Path": "/dev/cpuset/camera-daemon-high-group/cpus",
@@ -1774,18 +1765,6 @@
       "Node": "PMQoSCpuDmaLatency",
       "Duration": 2000,
       "Value": "44"
-    },
-    {
-      "PowerHint": "DEVICE_IDLE",
-      "Node": "RestrictedCpuset",
-      "Duration": 0,
-      "Value": "0-3"
-    },
-    {
-      "PowerHint": "DISPLAY_INACTIVE",
-      "Node": "RestrictedCpuset",
-      "Duration": 0,
-      "Value": "0-3"
     }
   ],
   "AdpfConfig": [