diff options
| -rw-r--r-- | core/java/android/provider/Settings.java | 10 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/provider/SettingsBackupTest.java | 1 | ||||
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 6 |
3 files changed, 17 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 70615c8c1915..b3314649a224 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -12304,6 +12304,16 @@ public final class Settings { "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 04cdb0be2563..81153ce3b80b 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -169,6 +169,7 @@ public class SettingsBackupTest { 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 70abf8054dbb..d165a45f0b01 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -196,6 +196,8 @@ public final class SystemServer { "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 = @@ -1543,6 +1545,10 @@ public final class SystemServer { } if (isWatch) { + traceBeginAndSlog("StartWearConfigService"); + mSystemServiceManager.startService(WEAR_CONFIG_SERVICE_CLASS); + traceEnd(); + traceBeginAndSlog("StartWearConnectivityService"); mSystemServiceManager.startService(WEAR_CONNECTIVITY_SERVICE_CLASS); traceEnd(); |