commit de80f4ee5fe31920874cdb655a1e064cea727db4
author songkailun <songkailun@xiaomi.com> Thu Nov 09 21:21:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 09 21:21:37 2017 +0000
tree c40f384b1dab2abe14ce514cd99fc8ec271cd229
parent 46644059a5d0b3e79263ef2b6e41eb57bff131d3
parent 0da27eb08c0501eac36085c6d9378e3c6426203c

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

Change-Id: I3e82479c29fe00c195b80e80497aaa2b402146cd

src/com/android/settings/PrivacySettings.java

diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index a44e182..e547570 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -63,7 +63,6 @@
     @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 @@
             nonVisibleKeys.add(AUTO_RESTORE);
             nonVisibleKeys.add(CONFIGURE_ACCOUNT);
         }
-        if (RestrictedLockUtils.hasBaseUserRestriction(context,
-                UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) {
-            nonVisibleKeys.add(FACTORY_RESET);
-        }
     }
 }