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

Commit 6198ec63 authored by Christine Franks's avatar Christine Franks Committed by Android (Google) Code Review
Browse files

Merge "Remove DEMO_USER_SETUP_COMPLETE"

parents 28053792 7b76e93b

core/java/android/provider/Settings.java

+0 −7
Original line number Diff line number Diff line
@@ -7190,13 +7190,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.

         *

core/proto/android/providers/settings.proto

+1 −1
Original line number Diff line number Diff line
@@ -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;

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

+0 −1
Original line number Diff line number Diff line
@@ -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,

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

+0 −3
Original line number Diff line number Diff line
@@ -1719,9 +1719,6 @@ class SettingsProtoDumpUtil { 
        dumpSetting(s, p,

                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);