Revert "STOPSHIP: Add UidCpuPower global setting"

This reverts commit 495665dc2f1f3cebc94d5f47629b018634a74074.

Reason for revert: b/73018322
Bug: 73018322

Change-Id: I1b83c4d916159e6961ec30576c7629e57978a72d

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index b6fab1e..7fd75c9 100644 (file)
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -10315,16 +10315,6 @@ public final class Settings {
         public static final String SYS_VDSO = "sys_vdso";
 
         /**
-        * Uid CpuPower global setting. This links the uid.cpupower system property.
-        * The following values are supported:
-        * 0 -> /proc/uid_cpupower/* are disabled
-        * 1 -> /proc/uid_cpupower/* are enabled
-        * Any other value defaults to enabled.
-        * @hide
-        */
-        public static final String UID_CPUPOWER = "uid_cpupower";
-
-        /**
          * An integer to reduce the FPS by this factor. Only for experiments. Need to reboot the
          * device for this setting to take full effect.
          *

diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index 05c12ae..853a36d 100644 (file)
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -389,7 +389,6 @@ public class SettingsBackupTest {
                     Settings.Global.TZINFO_UPDATE_METADATA_URL,
                     Settings.Global.INSTALLED_INSTANT_APP_MIN_CACHE_PERIOD,
                     Settings.Global.INSTALLED_INSTANT_APP_MAX_CACHE_PERIOD,
-                    Settings.Global.UID_CPUPOWER,
                     Settings.Global.UNINSTALLED_INSTANT_APP_MIN_CACHE_PERIOD,
                     Settings.Global.UNINSTALLED_INSTANT_APP_MAX_CACHE_PERIOD,
                     Settings.Global.UNUSED_STATIC_SHARED_LIB_MIN_CACHE_PERIOD,

diff --git a/services/core/java/com/android/server/am/GlobalSettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/GlobalSettingsToPropertiesMapper.java
index fe65978..9033b55 100644 (file)
--- a/services/core/java/com/android/server/am/GlobalSettingsToPropertiesMapper.java
+++ b/services/core/java/com/android/server/am/GlobalSettingsToPropertiesMapper.java
@@ -41,7 +41,6 @@ class GlobalSettingsToPropertiesMapper {
     //  {Settings.Global.SETTING_NAME, "system_property_name"},
         {Settings.Global.SYS_VDSO, "sys.vdso"},
         {Settings.Global.FPS_DEVISOR, ThreadedRenderer.DEBUG_FPS_DIVISOR},
-        {Settings.Global.UID_CPUPOWER, "uid.cpupower"},
         {Settings.Global.DISPLAY_PANEL_LPM, "sys.display_panel_lpm"},
     };