Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Add setting for enabling CPU frequency scaling."" into pi-dev

Browse Source 
am: 7723aed494

Change-Id: Ibc6fb095d97e53b9bd95b58e1fbbb77a92d24145
This commit is contained in:
Alice Sheng
2018-03-20 03:25:22 +00:00
committed by android-build-merger
parent 265efbd527 7723aed494
commit 4aa94a7c50
3 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/provider/Settings.java
View File

@@ -12331,16 +12331,6 @@ public final class Settings {
public static final String ZRAM_ENABLED =
"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:

1
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -170,7 +170,6 @@ 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,

6
services/java/com/android/server/SystemServer.java
View File

@@ -196,8 +196,6 @@ 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 =
@@ -1545,10 +1543,6 @@ public final class SystemServer {
}
if (isWatch) {
traceBeginAndSlog("StartWearConfigService");
mSystemServiceManager.startService(WEAR_CONFIG_SERVICE_CLASS);
traceEnd();
traceBeginAndSlog("StartWearConnectivityService");
mSystemServiceManager.startService(WEAR_CONNECTIVITY_SERVICE_CLASS);
traceEnd();