diff options
4 files changed, 1 insertions, 12 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 2f8651416057..61c4c6d251df 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -7191,13 +7191,6 @@ public final class Settings { public static final String QS_TILES = "sysui_qs_tiles"; /** - * Whether preloaded APKs have been installed for the user. - * @hide - */ - public static final String DEMO_USER_SETUP_COMPLETE - = "demo_user_setup_complete"; - - /** * Specifies whether the web action API is enabled. * * @hide diff --git a/core/proto/android/providers/settings.proto b/core/proto/android/providers/settings.proto index fb0ebed1545d..f5d098cc7771 100644 --- a/core/proto/android/providers/settings.proto +++ b/core/proto/android/providers/settings.proto @@ -582,7 +582,7 @@ message SecureSettingsProto { optional SettingProto downloads_backup_charging_only = 162; optional SettingProto automatic_storage_manager_downloads_days_to_retain = 163; optional SettingProto qs_tiles = 164; - optional SettingProto demo_user_setup_complete = 165; + reserved 165; // Removed demo_user_setup_complete optional SettingProto instant_apps_enabled = 166; optional SettingProto device_paired = 167; optional SettingProto package_verifier_state = 191; diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index fc8650086cd8..9df4f516e1e7 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -452,7 +452,6 @@ public class SettingsBackupTest { Settings.Secure.COMPLETED_CATEGORY_PREFIX, Settings.Secure.CONNECTIVITY_RELEASE_PENDING_INTENT_DELAY_MS, Settings.Secure.DEFAULT_INPUT_METHOD, - Settings.Secure.DEMO_USER_SETUP_COMPLETE, Settings.Secure.DEVICE_PAIRED, Settings.Secure.DIALER_DEFAULT_APPLICATION, Settings.Secure.DISABLED_PRINT_SERVICES, diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 1d3f26eec56d..48de1c92e890 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -1720,9 +1720,6 @@ class SettingsProtoDumpUtil { Settings.Secure.QS_TILES, SecureSettingsProto.QS_TILES); dumpSetting(s, p, - Settings.Secure.DEMO_USER_SETUP_COMPLETE, - SecureSettingsProto.DEMO_USER_SETUP_COMPLETE); - dumpSetting(s, p, Settings.Secure.INSTANT_APPS_ENABLED, SecureSettingsProto.INSTANT_APPS_ENABLED); dumpSetting(s, p, |