diff options
4 files changed, 1 insertions, 13 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 34c03aeadcc1..bbaf94ad6ea0 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -13713,14 +13713,6 @@ public final class Settings { "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. * * This is a list of integers separated by commas to represent pairs of (constellation, diff --git a/core/proto/android/providers/settings/global.proto b/core/proto/android/providers/settings/global.proto index a98d7db11913..d5384a1c2fdd 100644 --- a/core/proto/android/providers/settings/global.proto +++ b/core/proto/android/providers/settings/global.proto @@ -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; diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 0e3f81b81e02..aa36dca53bd9 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -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); diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 443811faf164..72782258d237 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -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, |