Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings"" into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-12-11 16:57:54 +00:00
committed by Android (Google) Code Review
parent 5895c90fe2 db70de3656
commit cb0b5e206d
5 changed files with 1 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/provider/Settings.java
View File

@@ -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}.

9
core/proto/android/providers/settings/secure.proto
View File

@@ -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;
}

1
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

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

4
packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
View File

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

13
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -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) {