diff --git a/device-oriole.mk b/device-oriole.mk
index b63fe07..b6cacb7 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -136,8 +136,7 @@ DEVICE_MANIFEST_FILE += \
 # Vibrator HAL
 PRODUCT_PRODUCT_PROPERTIES +=\
     ro.vendor.vibrator.hal.long.frequency.shift=15
-PRODUCT_VENDOR_PROPERTIES += \
-        vendor.powerhal.adpf.rate=11111111
+
 ACTUATOR_MODEL := luxshare_ict_081545
 
 # Voice packs for Text-To-Speech
diff --git a/device-raven.mk b/device-raven.mk
index 8586c24..395bb97 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -152,8 +152,7 @@ DEVICE_MANIFEST_FILE += \
 # Vibrator HAL
 PRODUCT_PRODUCT_PROPERTIES +=\
     ro.vendor.vibrator.hal.long.frequency.shift=15
-PRODUCT_VENDOR_PROPERTIES += \
-    vendor.powerhal.adpf.rate=8333333
+
 ACTUATOR_MODEL := luxshare_ict_081545
 
 # Voice packs for Text-To-Speech
diff --git a/powerhint-oriole.json b/powerhint-oriole.json
index e76c7ad..4b87044 100644
--- a/powerhint-oriole.json
+++ b/powerhint-oriole.json
@@ -1486,5 +1486,151 @@
       "Duration": 0,
       "Value": "1"
     }
-  ]
+  ],
+  "AdpfConfig": [
+    {
+      "Name": "REFRESH_120FPS",
+      "PID_On": true,
+      "PID_Po": 2.0,
+      "PID_Pu": 1.0,
+      "PID_I": 0.001,
+      "PID_I_Init": 200,
+      "PID_I_High": 512,
+      "PID_I_Low": -30,
+      "PID_Do": 500.0,
+      "PID_Du": 0.0,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 5,
+      "UclampMin_High": 384,
+      "UclampMin_Low": 2,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 0,
+      "SamplingWindow_D": 1,
+      "ReportingRateLimitNs": 83333330,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 20.0
+    },
+    {
+      "Name": "REFRESH_90FPS",
+      "PID_On": true,
+      "PID_Po": 2.0,
+      "PID_Pu": 1.0,
+      "PID_I": 0.001,
+      "PID_I_Init": 200,
+      "PID_I_High": 512,
+      "PID_I_Low": -30,
+      "PID_Do": 500.0,
+      "PID_Du": 0.0,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 5,
+      "UclampMin_High": 384,
+      "UclampMin_Low": 2,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 0,
+      "SamplingWindow_D": 1,
+      "ReportingRateLimitNs": 111111110,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 20.0
+    },
+    {
+      "Name": "REFRESH_60FPS",
+      "PID_On": true,
+      "PID_Po": 2.0,
+      "PID_Pu": 1.0,
+      "PID_I": 0.001,
+      "PID_I_Init": 200,
+      "PID_I_High": 512,
+      "PID_I_Low": -30,
+      "PID_Do": 500.0,
+      "PID_Du": 0.0,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 5,
+      "UclampMin_High": 384,
+      "UclampMin_Low": 2,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 0,
+      "SamplingWindow_D": 1,
+      "ReportingRateLimitNs": 166666660,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 20.0
+    },
+    {
+      "Name": "UiHighBoostWithoutPid",
+      "PID_On": false,
+      "PID_Po": 0,
+      "PID_Pu": 0,
+      "PID_I": 0,
+      "PID_I_Init": 0,
+      "PID_I_High": 0,
+      "PID_I_Low": 0,
+      "PID_Do": 0,
+      "PID_Du": 0,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 1,
+      "SamplingWindow_D": 1,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 0,
+      "UclampMin_High": 157,
+      "UclampMin_Low": 157,
+      "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 5.0
+    },
+    {
+      "Name": "UiLowBoostWithoutPid",
+      "PID_On": false,
+      "PID_Po": 0,
+      "PID_Pu": 0,
+      "PID_I": 0,
+      "PID_I_Init": 0,
+      "PID_I_High": 0,
+      "PID_I_Low": 0,
+      "PID_Do": 0,
+      "PID_Du": 0,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 1,
+      "SamplingWindow_D": 1,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 0,
+      "UclampMin_High": 42,
+      "UclampMin_Low": 42,
+      "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 5.0
+    },
+    {
+      "Name": "UiLowNoneBoost",
+      "PID_On": false,
+      "PID_Po": 0,
+      "PID_Pu": 0,
+      "PID_I": 0,
+      "PID_I_Init": 0,
+      "PID_I_High": 0,
+      "PID_I_Low": 0,
+      "PID_Do": 0,
+      "PID_Du": 0,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 1,
+      "SamplingWindow_D": 1,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 0,
+      "UclampMin_High": 0,
+      "UclampMin_Low": 0,
+      "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 5.0
+    }
+   ]
 }
diff --git a/powerhint-raven.json b/powerhint-raven.json
index 69ec157..944a454 100644
--- a/powerhint-raven.json
+++ b/powerhint-raven.json
@@ -1503,5 +1503,151 @@
       "Duration": 0,
       "Value": "1"
     }
-  ]
+  ],
+  "AdpfConfig": [
+    {
+      "Name": "REFRESH_120FPS",
+      "PID_On": true,
+      "PID_Po": 2.0,
+      "PID_Pu": 1.0,
+      "PID_I": 0.001,
+      "PID_I_Init": 200,
+      "PID_I_High": 512,
+      "PID_I_Low": -30,
+      "PID_Do": 500.0,
+      "PID_Du": 0.0,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 5,
+      "UclampMin_High": 384,
+      "UclampMin_Low": 2,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 0,
+      "SamplingWindow_D": 1,
+      "ReportingRateLimitNs": 83333330,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 20.0
+    },
+    {
+      "Name": "REFRESH_90FPS",
+      "PID_On": true,
+      "PID_Po": 2.0,
+      "PID_Pu": 1.0,
+      "PID_I": 0.001,
+      "PID_I_Init": 200,
+      "PID_I_High": 512,
+      "PID_I_Low": -30,
+      "PID_Do": 500.0,
+      "PID_Du": 0.0,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 5,
+      "UclampMin_High": 384,
+      "UclampMin_Low": 2,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 0,
+      "SamplingWindow_D": 1,
+      "ReportingRateLimitNs": 111111110,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 20.0
+    },
+    {
+      "Name": "REFRESH_60FPS",
+      "PID_On": true,
+      "PID_Po": 2.0,
+      "PID_Pu": 1.0,
+      "PID_I": 0.001,
+      "PID_I_Init": 200,
+      "PID_I_High": 512,
+      "PID_I_Low": -30,
+      "PID_Do": 500.0,
+      "PID_Du": 0.0,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 5,
+      "UclampMin_High": 384,
+      "UclampMin_Low": 2,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 0,
+      "SamplingWindow_D": 1,
+      "ReportingRateLimitNs": 166666660,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 20.0
+    },
+    {
+      "Name": "UiHighBoostWithoutPid",
+      "PID_On": false,
+      "PID_Po": 0,
+      "PID_Pu": 0,
+      "PID_I": 0,
+      "PID_I_Init": 0,
+      "PID_I_High": 0,
+      "PID_I_Low": 0,
+      "PID_Do": 0,
+      "PID_Du": 0,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 1,
+      "SamplingWindow_D": 1,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 0,
+      "UclampMin_High": 157,
+      "UclampMin_Low": 157,
+      "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 5.0
+    },
+    {
+      "Name": "UiLowBoostWithoutPid",
+      "PID_On": false,
+      "PID_Po": 0,
+      "PID_Pu": 0,
+      "PID_I": 0,
+      "PID_I_Init": 0,
+      "PID_I_High": 0,
+      "PID_I_Low": 0,
+      "PID_Do": 0,
+      "PID_Du": 0,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 1,
+      "SamplingWindow_D": 1,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 0,
+      "UclampMin_High": 42,
+      "UclampMin_Low": 42,
+      "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 5.0
+    },
+    {
+      "Name": "UiLowNoneBoost",
+      "PID_On": false,
+      "PID_Po": 0,
+      "PID_Pu": 0,
+      "PID_I": 0,
+      "PID_I_Init": 0,
+      "PID_I_High": 0,
+      "PID_I_Low": 0,
+      "PID_Do": 0,
+      "PID_Du": 0,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 1,
+      "SamplingWindow_D": 1,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 0,
+      "UclampMin_High": 0,
+      "UclampMin_Low": 0,
+      "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 5.0
+    }
+   ]
 }
diff --git a/powerhint-slider.json b/powerhint-slider.json
index 7ee9ab4..1b0f012 100644
--- a/powerhint-slider.json
+++ b/powerhint-slider.json
@@ -1406,5 +1406,151 @@
       "Duration": 0,
       "Value": "1"
     }
-  ]
+  ],
+  "AdpfConfig": [
+    {
+      "Name": "REFRESH_120FPS",
+      "PID_On": true,
+      "PID_Po": 2.0,
+      "PID_Pu": 1.0,
+      "PID_I": 0.001,
+      "PID_I_Init": 200,
+      "PID_I_High": 512,
+      "PID_I_Low": -30,
+      "PID_Do": 500.0,
+      "PID_Du": 0.0,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 5,
+      "UclampMin_High": 384,
+      "UclampMin_Low": 2,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 0,
+      "SamplingWindow_D": 1,
+      "ReportingRateLimitNs": 83333330,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 20.0
+    },
+    {
+      "Name": "REFRESH_90FPS",
+      "PID_On": true,
+      "PID_Po": 2.0,
+      "PID_Pu": 1.0,
+      "PID_I": 0.001,
+      "PID_I_Init": 200,
+      "PID_I_High": 512,
+      "PID_I_Low": -30,
+      "PID_Do": 500.0,
+      "PID_Du": 0.0,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 5,
+      "UclampMin_High": 384,
+      "UclampMin_Low": 2,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 0,
+      "SamplingWindow_D": 1,
+      "ReportingRateLimitNs": 111111110,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 20.0
+    },
+    {
+      "Name": "REFRESH_60FPS",
+      "PID_On": true,
+      "PID_Po": 2.0,
+      "PID_Pu": 1.0,
+      "PID_I": 0.001,
+      "PID_I_Init": 200,
+      "PID_I_High": 512,
+      "PID_I_Low": -30,
+      "PID_Do": 500.0,
+      "PID_Du": 0.0,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 5,
+      "UclampMin_High": 384,
+      "UclampMin_Low": 2,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 0,
+      "SamplingWindow_D": 1,
+      "ReportingRateLimitNs": 166666660,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 20.0
+    },
+    {
+      "Name": "UiHighBoostWithoutPid",
+      "PID_On": false,
+      "PID_Po": 0,
+      "PID_Pu": 0,
+      "PID_I": 0,
+      "PID_I_Init": 0,
+      "PID_I_High": 0,
+      "PID_I_Low": 0,
+      "PID_Do": 0,
+      "PID_Du": 0,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 1,
+      "SamplingWindow_D": 1,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 0,
+      "UclampMin_High": 157,
+      "UclampMin_Low": 157,
+      "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 5.0
+    },
+    {
+      "Name": "UiLowBoostWithoutPid",
+      "PID_On": false,
+      "PID_Po": 0,
+      "PID_Pu": 0,
+      "PID_I": 0,
+      "PID_I_Init": 0,
+      "PID_I_High": 0,
+      "PID_I_Low": 0,
+      "PID_Do": 0,
+      "PID_Du": 0,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 1,
+      "SamplingWindow_D": 1,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 0,
+      "UclampMin_High": 42,
+      "UclampMin_Low": 42,
+      "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 5.0
+    },
+    {
+      "Name": "UiLowNoneBoost",
+      "PID_On": false,
+      "PID_Po": 0,
+      "PID_Pu": 0,
+      "PID_I": 0,
+      "PID_I_Init": 0,
+      "PID_I_High": 0,
+      "PID_I_Low": 0,
+      "PID_Do": 0,
+      "PID_Du": 0,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 1,
+      "SamplingWindow_D": 1,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 0,
+      "UclampMin_High": 0,
+      "UclampMin_Low": 0,
+      "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 5.0
+    }
+   ]
 }
diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json
index d5eab6b..8db67c2 100644
--- a/powerhint-whitefin.json
+++ b/powerhint-whitefin.json
@@ -1379,5 +1379,151 @@
       "Duration": 2000,
       "Value": "512"
     }
-  ]
+  ],
+  "AdpfConfig": [
+    {
+      "Name": "REFRESH_120FPS",
+      "PID_On": true,
+      "PID_Po": 2.0,
+      "PID_Pu": 1.0,
+      "PID_I": 0.001,
+      "PID_I_Init": 200,
+      "PID_I_High": 512,
+      "PID_I_Low": -30,
+      "PID_Do": 500.0,
+      "PID_Du": 0.0,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 5,
+      "UclampMin_High": 384,
+      "UclampMin_Low": 2,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 0,
+      "SamplingWindow_D": 1,
+      "ReportingRateLimitNs": 83333330,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 20.0
+    },
+    {
+      "Name": "REFRESH_90FPS",
+      "PID_On": true,
+      "PID_Po": 2.0,
+      "PID_Pu": 1.0,
+      "PID_I": 0.001,
+      "PID_I_Init": 200,
+      "PID_I_High": 512,
+      "PID_I_Low": -30,
+      "PID_Do": 500.0,
+      "PID_Du": 0.0,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 5,
+      "UclampMin_High": 384,
+      "UclampMin_Low": 2,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 0,
+      "SamplingWindow_D": 1,
+      "ReportingRateLimitNs": 111111110,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 20.0
+    },
+    {
+      "Name": "REFRESH_60FPS",
+      "PID_On": true,
+      "PID_Po": 2.0,
+      "PID_Pu": 1.0,
+      "PID_I": 0.001,
+      "PID_I_Init": 200,
+      "PID_I_High": 512,
+      "PID_I_Low": -30,
+      "PID_Do": 500.0,
+      "PID_Du": 0.0,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 5,
+      "UclampMin_High": 384,
+      "UclampMin_Low": 2,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 0,
+      "SamplingWindow_D": 1,
+      "ReportingRateLimitNs": 166666660,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 20.0
+    },
+    {
+      "Name": "UiHighBoostWithoutPid",
+      "PID_On": false,
+      "PID_Po": 0,
+      "PID_Pu": 0,
+      "PID_I": 0,
+      "PID_I_Init": 0,
+      "PID_I_High": 0,
+      "PID_I_Low": 0,
+      "PID_Do": 0,
+      "PID_Du": 0,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 1,
+      "SamplingWindow_D": 1,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 0,
+      "UclampMin_High": 157,
+      "UclampMin_Low": 157,
+      "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 5.0
+    },
+    {
+      "Name": "UiLowBoostWithoutPid",
+      "PID_On": false,
+      "PID_Po": 0,
+      "PID_Pu": 0,
+      "PID_I": 0,
+      "PID_I_Init": 0,
+      "PID_I_High": 0,
+      "PID_I_Low": 0,
+      "PID_Do": 0,
+      "PID_Du": 0,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 1,
+      "SamplingWindow_D": 1,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 0,
+      "UclampMin_High": 42,
+      "UclampMin_Low": 42,
+      "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 5.0
+    },
+    {
+      "Name": "UiLowNoneBoost",
+      "PID_On": false,
+      "PID_Po": 0,
+      "PID_Pu": 0,
+      "PID_I": 0,
+      "PID_I_Init": 0,
+      "PID_I_High": 0,
+      "PID_I_Low": 0,
+      "PID_Do": 0,
+      "PID_Du": 0,
+      "SamplingWindow_P": 1,
+      "SamplingWindow_I": 1,
+      "SamplingWindow_D": 1,
+      "UclampMin_On": true,
+      "UclampMin_Granularity": 0,
+      "UclampMin_High": 0,
+      "UclampMin_Low": 0,
+      "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0.0,
+      "TargetTimeFactor": 1.0,
+      "StaleTimeFactor": 5.0
+    }
+   ]
 }