Merge cherrypicks of [9899055] into qt-qpr2-release (575ec476) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -5979,16 +5979,6 @@ public final class Settings {
		@TestApi
		public static final String USER_SETUP_COMPLETE = "user_setup_complete";

		/**
		* Whether the Auto Embedded Setup Wizard (0 = false, 1 = true) is in progress.
		* This differs from USER_SETUP_COMPLETE in that it can be reset back to 0
		* in case Setup Wizard has been re-enabled on Auto Embedded devices.
		*
		* @hide
		*/
		public static final String AUTOMOTIVE_USER_SETUP_IN_PROGRESS =
		"automotive_user_setup_in_progress";

		/**
		* Indicates that the user has not started setup personalization.
		* One of the possible states for {@link #USER_SETUP_PERSONALIZATION_STATE}.

+1 −8

Original line number	Diff line number	Diff line
		@@ -139,13 +139,6 @@ message SecureSettingsProto {
		}
		optional AutomaticStorageManager automatic_storage_manager = 9;

		message Automotive {
		option (android.msg_privacy).dest = DEST_EXPLICIT;

		optional SettingProto automotive_user_setup_in_progress = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
		}
		optional Automotive automotive = 77;

		message Backup {
		option (android.msg_privacy).dest = DEST_EXPLICIT;

		@@ -573,5 +566,5 @@ message SecureSettingsProto {

		// Please insert fields in alphabetical order and group them into messages
		// if possible (to avoid reaching the method limit).
		// Next tag = 78;
		// Next tag = 77;
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -703,7 +703,6 @@ public class SettingsBackupTest {
		Settings.Secure.UNSAFE_VOLUME_MUSIC_ACTIVE_MS,
		Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED,
		Settings.Secure.USER_SETUP_COMPLETE,
		Settings.Secure.AUTOMOTIVE_USER_SETUP_IN_PROGRESS,
		Settings.Secure.USER_SETUP_PERSONALIZATION_STATE,
		Settings.Secure.VOICE_INTERACTION_SERVICE,
		Settings.Secure.VOICE_RECOGNITION_SERVICE,

+0 −4

Original line number	Diff line number	Diff line
		@@ -2411,10 +2411,6 @@ class SettingsProtoDumpUtil {
		Settings.Secure.USER_SETUP_COMPLETE,
		SecureSettingsProto.USER_SETUP_COMPLETE);

		dumpSetting(s, p,
		Settings.Secure.AUTOMOTIVE_USER_SETUP_IN_PROGRESS,
		SecureSettingsProto.Automotive.AUTOMOTIVE_USER_SETUP_IN_PROGRESS);

		final long voiceToken = p.start(SecureSettingsProto.VOICE);
		dumpSetting(s, p,
		Settings.Secure.VOICE_INTERACTION_SERVICE,

+0 −13

Original line number	Diff line number	Diff line
		@@ -4449,19 +4449,6 @@ public class SettingsProvider extends ContentProvider {
		currentVersion = 183;
		}

		if (currentVersion == 183) {
		// Version 169: by default, automotive setup wizard is in progress
		final SettingsState secureSettings = getSecureSettingsLocked(userId);
		Setting currentSetting = secureSettings.getSettingLocked(
		Secure.AUTOMOTIVE_USER_SETUP_IN_PROGRESS);
		if (currentSetting.isNull()) {
		secureSettings.insertSettingLocked(
		Secure.AUTOMOTIVE_USER_SETUP_IN_PROGRESS, "1", null, true,
		SettingsState.SYSTEM_PACKAGE_NAME);
		}
		currentVersion = 184;
		}

		// vXXX: Add new settings above this point.

		if (currentVersion != newVersion) {