Merge "Introduce Global.LOCATION_GLOBAL_KILL_SWITCH" (fd315a9f) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -10455,6 +10455,15 @@ 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
		*/
		public static final String LOCATION_GLOBAL_KILL_SWITCH =
		"location_global_kill_switch";

		/**
		* Settings to backup. This is here so that it's in the same place as the settings
		* keys and easy to update.

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -231,6 +231,7 @@ public class SettingsBackupTest {
		Settings.Global.LOCATION_BACKGROUND_THROTTLE_INTERVAL_MS,
		Settings.Global.LOCATION_BACKGROUND_THROTTLE_PROXIMITY_ALERT_INTERVAL_MS,
		Settings.Global.LOCATION_BACKGROUND_THROTTLE_PACKAGE_WHITELIST,
		Settings.Global.LOCATION_GLOBAL_KILL_SWITCH,
		Settings.Global.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED,
		Settings.Global.LOCK_SOUND,
		Settings.Global.LOW_BATTERY_SOUND,

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+69 −2

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ import android.os.UserManager;
		import android.os.UserManagerInternal;
		import android.provider.Settings;
		import android.provider.Settings.Global;
		import android.provider.Settings.Secure;
		import android.text.TextUtils;
		import android.util.ArrayMap;
		import android.util.ArraySet;
		@@ -343,7 +344,8 @@ public class SettingsProvider extends ContentProvider {
		}

		case Settings.CALL_METHOD_GET_SECURE: {
		Setting setting = getSecureSetting(name, requestingUserId);
		Setting setting = getSecureSetting(name, requestingUserId,
		/enableOverride=/ true);
		return packageValueForCallResult(setting, isTrackingGeneration(args));
		}

		@@ -1073,6 +1075,10 @@ public class SettingsProvider extends ContentProvider {
		}

		private Setting getSecureSetting(String name, int requestingUserId) {
		return getSecureSetting(name, requestingUserId, /enableOverride=/ false);
		}

		private Setting getSecureSetting(String name, int requestingUserId, boolean enableOverride) {
		if (DEBUG) {
		Slog.v(LOG_TAG, "getSecureSetting(" + name + ", " + requestingUserId + ")");
		}
		@@ -1102,6 +1108,14 @@ public class SettingsProvider extends ContentProvider {
		return getSsaidSettingLocked(callingPkg, owningUserId);
		}
		}
		if (enableOverride) {
		if (Secure.LOCATION_PROVIDERS_ALLOWED.equals(name)) {
		final Setting overridden = getLocationProvidersAllowedSetting(owningUserId);
		if (overridden != null) {
		return overridden;
		}
		}
		}

		// Not the SSAID; do a straight lookup
		synchronized (mLock) {
		@@ -1190,6 +1204,35 @@ public class SettingsProvider extends ContentProvider {
		return null;
		}

		private Setting getLocationProvidersAllowedSetting(int owningUserId) {
		synchronized (mLock) {
		final Setting setting = getGlobalSetting(
		Global.LOCATION_GLOBAL_KILL_SWITCH);
		if (!"1".equals(setting.getValue())) {
		return null;
		}
		// Global kill-switch is enabled. Return an empty value.
		final SettingsState settingsState = mSettingsRegistry.getSettingsLocked(
		SETTINGS_TYPE_SECURE, owningUserId);
		return settingsState.new Setting(
		Secure.LOCATION_PROVIDERS_ALLOWED,
		"", // value
		"", // tag
		"", // default value
		"", // package name
		false, // from system
		"0" // id
		) {
		@Override
		public boolean update(String value, boolean setDefault, String packageName,
		String tag, boolean forceNonSystemPackage) {
		Slog.wtf(LOG_TAG, "update shoudln't be called on this instance.");
		return false;
		}
		};
		}
		}

		private boolean insertSecureSetting(String name, String value, String tag,
		boolean makeDefault, int requestingUserId, boolean forceNotify) {
		if (DEBUG) {
		@@ -2780,6 +2823,12 @@ public class SettingsProvider extends ContentProvider {
		}

		mHandler.obtainMessage(MyHandler.MSG_NOTIFY_DATA_CHANGED).sendToTarget();

		// When the global kill switch is updated, send the change notification for
		// the location setting.
		if (isGlobalSettingsKey(key) && Global.LOCATION_GLOBAL_KILL_SWITCH.equals(name)) {
		notifyLocationChangeForRunningUsers();
		}
		}

		private void maybeNotifyProfiles(int type, int userId, Uri uri, String name,
		@@ -2799,6 +2848,24 @@ public class SettingsProvider extends ContentProvider {
		}
		}

		private void notifyLocationChangeForRunningUsers() {
		final List<UserInfo> users = mUserManager.getUsers(/excludeDying=/ true);

		for (int i = 0; i < users.size(); i++) {
		final int userId = users.get(i).id;

		if (!mUserManager.isUserRunning(UserHandle.of(userId))) {
		continue;
		}

		final int key = makeKey(SETTINGS_TYPE_GLOBAL, userId);
		final Uri uri = getNotificationUriFor(key, Secure.LOCATION_PROVIDERS_ALLOWED);

		mHandler.obtainMessage(MyHandler.MSG_NOTIFY_URI_CHANGED,
		userId, 0, uri).sendToTarget();
		}
		}

		private boolean isGlobalSettingsKey(int key) {
		return getTypeFromKey(key) == SETTINGS_TYPE_GLOBAL;
		}
		@@ -2885,7 +2952,7 @@ public class SettingsProvider extends ContentProvider {
		} catch (SecurityException e) {
		Slog.w(LOG_TAG, "Failed to notify for " + userId + ": " + uri, e);
		}
		if (DEBUG) {
		if (DEBUG \|\| true) {
		Slog.v(LOG_TAG, "Notifying for " + userId + ": " + uri);
		}
		} break;