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

Commit 00a2b6d4 authored by Soonil Nagarkar's avatar Soonil Nagarkar
Browse files

Remove LOCATION_GLOBAL_KILL_SWITCH completely 

This functionality is no longer needed as all battery saver related
logic is handled within location code.

Bug: 69373668
Test: presubmits
Change-Id: Ie79d6334e0aff5a6562ae0014b9274c81434b977
parent 1681b437

core/api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -1491,7 +1491,6 @@ package android.provider { 
    field public static final String HIDDEN_API_BLACKLIST_EXEMPTIONS = "hidden_api_blacklist_exemptions";

    field public static final String HIDDEN_API_POLICY = "hidden_api_policy";

    field public static final String HIDE_ERROR_DIALOGS = "hide_error_dialogs";

    field public static final String LOCATION_GLOBAL_KILL_SWITCH = "location_global_kill_switch";

    field public static final String LOCATION_IGNORE_SETTINGS_PACKAGE_WHITELIST = "location_ignore_settings_package_whitelist";

    field public static final String LOW_POWER_MODE = "low_power";

    field public static final String LOW_POWER_MODE_STICKY = "low_power_sticky";

core/java/android/provider/Settings.java

+0 −10
Original line number Diff line number Diff line
@@ -13285,16 +13285,6 @@ public final class Settings { 
        public static final String STORAGE_SETTINGS_CLOBBER_THRESHOLD =

                "storage_settings_clobber_threshold";













        /**













         * If set to 1, {@link Secure#LOCATION_MODE} will be set to {@link Secure#LOCATION_MODE_OFF}













         * temporarily for all users.













         *













         * @hide













         */













        @TestApi













        public static final String LOCATION_GLOBAL_KILL_SWITCH =













                "location_global_kill_switch";



























        /**















         * If set to 1, SettingsProvider's restoreAnyVersion="true" attribute will be ignored















         * and restoring to lower version of platform API will be skipped.

































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -319,7 +319,6 @@ public class SettingsBackupTest {













                    Settings.Global.LOCATION_BACKGROUND_THROTTLE_PROXIMITY_ALERT_INTERVAL_MS,















                    Settings.Global.LOCATION_BACKGROUND_THROTTLE_PACKAGE_WHITELIST,















                    Settings.Global.LOCATION_IGNORE_SETTINGS_PACKAGE_WHITELIST,













                    Settings.Global.LOCATION_GLOBAL_KILL_SWITCH,















                    Settings.Global.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED,















                    Settings.Global.LOCK_SOUND,















                    Settings.Global.LOOPER_STATS,

































services/core/java/com/android/server/pm/UserRestrictionsUtils.java



+0
−18




























Original line number
Diff line number
Diff line








@@ -34,7 +34,6 @@ import android.os.RemoteException;













import android.os.UserHandle;















import android.os.UserManager;















import android.provider.Settings;













import android.provider.Settings.Global;















import android.telephony.SubscriptionInfo;















import android.telephony.SubscriptionManager;















import android.util.Log;










@@ -670,15 +669,6 @@ public class UserRestrictionsUtils {













                                Settings.Secure.DOZE_DOUBLE_TAP_GESTURE, 0, userId);















                    }















                    break;













                case UserManager.DISALLOW_CONFIG_LOCATION:













                    // When DISALLOW_CONFIG_LOCATION is set on any user, we undo the global













                    // kill switch.













                    if (newValue) {













                        android.provider.Settings.Global.putString(













                                context.getContentResolver(),













                                Global.LOCATION_GLOBAL_KILL_SWITCH, "0");













                    }













                    break;















                case UserManager.DISALLOW_APPS_CONTROL:















                    // Intentional fall-through















                case UserManager.DISALLOW_UNINSTALL_APPS:










@@ -774,14 +764,6 @@ public class UserRestrictionsUtils {













                restriction = UserManager.DISALLOW_AMBIENT_DISPLAY;















                break;





























            case android.provider.Settings.Global.LOCATION_GLOBAL_KILL_SWITCH:













                if ("0".equals(value)) {













                    return false;













                }













                restriction = UserManager.DISALLOW_CONFIG_LOCATION;













                checkAllUser = true;













                break;





























            case android.provider.Settings.System.SCREEN_BRIGHTNESS:















            case android.provider.Settings.System.SCREEN_BRIGHTNESS_FLOAT:















            case android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE:

































services/core/java/com/android/server/power/batterysaver/BatterySaverController.java



+2
−3




























Original line number
Diff line number
Diff line








@@ -224,10 +224,9 @@ public class BatterySaverController implements BatterySaverPolicyListener {













        mFileUpdater = new FileUpdater(context);















        mBatterySavingStats = batterySavingStats;





























        // TODO(79580230): remove plugin code and maybe screen on/off listeners?















        // Initialize plugins.













        mPlugins = new Plugin[] {













                new BatterySaverLocationPlugin(mContext)













        };













        mPlugins = new Plugin[0];















        PowerManager.invalidatePowerSaveModeCaches();















    }