PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "remove unused code in PrivacySettings" am: abd78cc6b3 am: 0da27eb08c

Browse Source 
am: de80f4ee5f

Change-Id: Iaff60e1fa06b9c73de21a5693383ea17b4a06e91
This commit is contained in:
songkailun
2017-11-09 22:50:47 +00:00
committed by android-build-merger
parent df6026453e de80f4ee5f
commit 538f78c839
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/PrivacySettings.java
View File

@@ -63,7 +63,6 @@ public class PrivacySettings extends SettingsPreferenceFragment {
@VisibleForTesting @VisibleForTesting
static final String DATA_MANAGEMENT = "data_management"; static final String DATA_MANAGEMENT = "data_management";
private static final String BACKUP_INACTIVE = "backup_inactive"; private static final String BACKUP_INACTIVE = "backup_inactive";
private static final String FACTORY_RESET = "factory_reset";
private static final String TAG = "PrivacySettings"; private static final String TAG = "PrivacySettings";
private IBackupManager mBackupManager; private IBackupManager mBackupManager;
private Preference mBackup; private Preference mBackup;
@@ -245,9 +244,5 @@ public class PrivacySettings extends SettingsPreferenceFragment {
nonVisibleKeys.add(AUTO_RESTORE); nonVisibleKeys.add(AUTO_RESTORE);
nonVisibleKeys.add(CONFIGURE_ACCOUNT); nonVisibleKeys.add(CONFIGURE_ACCOUNT);
} }
if (RestrictedLockUtils.hasBaseUserRestriction(context,
UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) {
nonVisibleKeys.add(FACTORY_RESET);
}
} }
} }