From 199cb39de9532bd329594d25be2d514592bc8edb Mon Sep 17 00:00:00 2001 From: songkailun Date: Tue, 7 Nov 2017 19:28:55 +0800 Subject: [PATCH] remove unused code in PrivacySettings factory_reset is already removed from privacy_settings.xml, so it need to be removed from PrivacySettings.java too Change-Id: I0d295b90173102efb962dde496cf7a8b15d1e0a9 Signed-off-by: songkailun --- src/com/android/settings/PrivacySettings.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java index a44e18253f0..e5475700c2d 100644 --- a/src/com/android/settings/PrivacySettings.java +++ b/src/com/android/settings/PrivacySettings.java @@ -63,7 +63,6 @@ public class PrivacySettings extends SettingsPreferenceFragment { @VisibleForTesting static final String DATA_MANAGEMENT = "data_management"; private static final String BACKUP_INACTIVE = "backup_inactive"; - private static final String FACTORY_RESET = "factory_reset"; private static final String TAG = "PrivacySettings"; private IBackupManager mBackupManager; private Preference mBackup; @@ -245,9 +244,5 @@ public class PrivacySettings extends SettingsPreferenceFragment { nonVisibleKeys.add(AUTO_RESTORE); nonVisibleKeys.add(CONFIGURE_ACCOUNT); } - if (RestrictedLockUtils.hasBaseUserRestriction(context, - UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) { - nonVisibleKeys.add(FACTORY_RESET); - } } }