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

Commit 0447bc35 authored by Chandan Nath's avatar Chandan Nath Committed by Android (Google) Code Review
Browse files

Merge "remove unused BACKUP_MULTI_USER_ENABLED"

parents d534534a 5665ce56

core/java/android/provider/Settings.java

+0 −8
Original line number Diff line number Diff line
@@ -13712,14 +13712,6 @@ public final class Settings { 
        public static final String BACKUP_AGENT_TIMEOUT_PARAMETERS =

                "backup_agent_timeout_parameters";













        /**













         * Whether the backup system service supports multiple users (0 = disabled, 1 = enabled). If













         * disabled, the service will only be active for the system user.













         *













         * @hide













         */













        public static final String BACKUP_MULTI_USER_ENABLED = "backup_multi_user_enabled";



























        /**















         * Blacklist of GNSS satellites.















         *

























core/proto/android/providers/settings/global.proto



+1
−1




























Original line number
Diff line number
Diff line








@@ -115,7 +115,7 @@ message GlobalSettingsProto {













        option (android.msg_privacy).dest = DEST_EXPLICIT;































        optional SettingProto backup_agent_timeout_parameters = 1;













        optional SettingProto backup_multi_user_enabled = 2;













        reserved 2; // Used to be backup_multi_user_enabled which was never used















    }















    optional Backup backup = 146;

















































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



+0
−3




























Original line number
Diff line number
Diff line








@@ -266,9 +266,6 @@ class SettingsProtoDumpUtil {













        dumpSetting(s, p,















                Settings.Global.BACKUP_AGENT_TIMEOUT_PARAMETERS,















                GlobalSettingsProto.Backup.BACKUP_AGENT_TIMEOUT_PARAMETERS);













        dumpSetting(s, p,













                Settings.Global.BACKUP_MULTI_USER_ENABLED,













                GlobalSettingsProto.Backup.BACKUP_MULTI_USER_ENABLED);















        p.end(backupToken);































        final long batteryToken = p.start(GlobalSettingsProto.BATTERY);

































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -571,7 +571,6 @@ public class SettingsBackupTest {













                    Settings.Global.CHAINED_BATTERY_ATTRIBUTION_ENABLED,















                    Settings.Global.HIDDEN_API_BLACKLIST_EXEMPTIONS,















                    Settings.Global.BACKUP_AGENT_TIMEOUT_PARAMETERS,













                    Settings.Global.BACKUP_MULTI_USER_ENABLED,















                    Settings.Global.ISOLATED_STORAGE_LOCAL,















                    Settings.Global.ISOLATED_STORAGE_REMOTE,















                    Settings.Global.APPOP_HISTORY_PARAMETERS,