Revert "Add setting for enabling CPU frequency scaling."
This reverts commit 2e8afd8736cba3352bcbf585461becb20a7c7600.
Reason for revert: SELinux Boot crash
Bug: 75974893
Change-Id: I4751530a1b460842130a495efe688aaf19b92638
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index c4f1fd0..bd29d2d 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -12233,16 +12233,6 @@
"zram_enabled";
/**
- * Whether we have enable CPU frequency scaling for this device.
- * For Wear, default is disable.
- *
- * The value is "1" for enable, "0" for disable.
- * @hide
- */
- public static final String CPU_SCALING_ENABLED =
- "cpu_frequency_scaling_enabled";
-
- /**
* Configuration flags for smart replies in notifications.
* This is encoded as a key=value list, separated by commas. Ex:
*
diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index 950ae68..6c72ac1 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -169,7 +169,6 @@
Settings.Global.CONNECTIVITY_SAMPLING_INTERVAL_IN_SECONDS,
Settings.Global.CONTACT_METADATA_SYNC_ENABLED,
Settings.Global.CONTACTS_DATABASE_WAL_ENABLED,
- Settings.Global.CPU_SCALING_ENABLED,
Settings.Global.DATA_ACTIVITY_TIMEOUT_MOBILE,
Settings.Global.DATA_ACTIVITY_TIMEOUT_WIFI,
Settings.Global.DATABASE_CREATION_BUILDID,
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 076edb5..6259926 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -196,8 +196,6 @@
"com.android.server.search.SearchManagerService$Lifecycle";
private static final String THERMAL_OBSERVER_CLASS =
"com.google.android.clockwork.ThermalObserver";
- private static final String WEAR_CONFIG_SERVICE_CLASS =
- "com.google.android.clockwork.WearConfigManagerService";
private static final String WEAR_CONNECTIVITY_SERVICE_CLASS =
"com.android.clockwork.connectivity.WearConnectivityService";
private static final String WEAR_SIDEKICK_SERVICE_CLASS =
@@ -1537,10 +1535,6 @@
}
if (isWatch) {
- traceBeginAndSlog("StartWearConfigService");
- mSystemServiceManager.startService(WEAR_CONFIG_SERVICE_CLASS);
- traceEnd();
-
traceBeginAndSlog("StartWearConnectivityService");
mSystemServiceManager.startService(WEAR_CONNECTIVITY_SERVICE_CLASS);
traceEnd();