Merge "Remove LOCATION_GLOBAL_KILL_SWITCH completely" (825d4761) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -1500,7 +1500,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";

+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.

+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,

+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:

+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();
		}