Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7723aed4 authored by Alice Sheng's avatar Alice Sheng Committed by Android (Google) Code Review
Browse files

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

parents f4f31779 67503522

core/java/android/provider/Settings.java

+0 −10
Original line number Diff line number Diff line
@@ -12325,16 +12325,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:

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+0 −1
Original line number Diff line number Diff line
@@ -169,7 +169,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,

services/java/com/android/server/SystemServer.java

+0 −6
Original line number Diff line number Diff line
@@ -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();