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

Commit 1cc77c6e authored Oct 04, 2019 by Mady Mellor Committed by Android (Google) Code Review Oct 04, 2019

Merge "Stop tracking the secure setting because we're in master"

parents f25b446c fa9556a3

api/test-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -2405,7 +2405,6 @@ package android.provider {
		field public static final String LOCATION_ACCESS_CHECK_DELAY_MILLIS = "location_access_check_delay_millis";
		field public static final String LOCATION_ACCESS_CHECK_INTERVAL_MILLIS = "location_access_check_interval_millis";
		field public static final String NOTIFICATION_BADGING = "notification_badging";
		field @Deprecated public static final String NOTIFICATION_BUBBLES = "notification_bubbles";
		field @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static final String SYNC_PARENT_SOUNDS = "sync_parent_sounds";
		field public static final String USER_SETUP_COMPLETE = "user_setup_complete";
		field public static final String VOICE_INTERACTION_SERVICE = "voice_interaction_service";

core/java/android/provider/Settings.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -7907,16 +7907,6 @@ public final class Settings {
		@TestApi
		public static final String NOTIFICATION_BADGING = "notification_badging";

		/**
		* Whether the notification bubbles are globally enabled
		* The value is boolean (1 or 0).
		* @hide
		* @deprecated use {@link Global#NOTIFICATION_BUBBLES} instead.
		*/
		@TestApi
		@Deprecated
		public static final String NOTIFICATION_BUBBLES = "notification_bubbles";

		/**
		* Whether notifications are dismissed by a right-to-left swipe (instead of a left-to-right
		* swipe).

packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -114,7 +114,6 @@ public class SecureSettings {
		Settings.Secure.ASSIST_GESTURE_WAKE_ENABLED,
		Settings.Secure.VR_DISPLAY_MODE,
		Settings.Secure.NOTIFICATION_BADGING,
		Settings.Secure.NOTIFICATION_BUBBLES,
		Settings.Secure.NOTIFICATION_DISMISS_RTL,
		Settings.Secure.QS_AUTO_ADDED_TILES,
		Settings.Secure.SCREENSAVER_ENABLED,

packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -157,7 +157,6 @@ public class SecureSettingsValidators {
		VALIDATORS.put(Secure.ASSIST_GESTURE_WAKE_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.VR_DISPLAY_MODE, new DiscreteValueValidator(new String[] {"0", "1"}));
		VALIDATORS.put(Secure.NOTIFICATION_BADGING, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.NOTIFICATION_BUBBLES, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.NOTIFICATION_DISMISS_RTL, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.QS_AUTO_ADDED_TILES, TILE_LIST_VALIDATOR);
		VALIDATORS.put(Secure.SCREENSAVER_ENABLED, BOOLEAN_VALIDATOR);

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -4385,8 +4385,7 @@ public class SettingsProvider extends ContentProvider {

		if (currentVersion == 182) {
		// Remove secure bubble settings.
		getSecureSettingsLocked(userId).deleteSettingLocked(
		Secure.NOTIFICATION_BUBBLES);
		getSecureSettingsLocked(userId).deleteSettingLocked("notification_bubbles");

		// Add global bubble settings.
		getGlobalSettingsLocked().insertSettingLocked(Global.NOTIFICATION_BUBBLES,