Loading src/com/android/settings/PrivacySettings.java +3 −1 Original line number Diff line number Diff line Loading @@ -81,7 +81,9 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index super.onCreate(savedInstanceState); // Don't allow any access if this is not an admin user. // TODO: backup/restore currently only works with owner user b/22760572 mEnabled = UserManager.get(getActivity()).isAdminUser(); // /e/ Do NOT display Backup & reset item for the moment. mEnabled = false;//UserManager.get(getActivity()).isAdminUser(); if (!mEnabled) { return; } Loading src/com/android/settings/SettingsActivity.java +6 −0 Original line number Diff line number Diff line Loading @@ -1169,6 +1169,9 @@ public class SettingsActivity extends SettingsDrawerActivity String backupIntent = getResources().getString(R.string.config_backup_settings_intent); boolean useDefaultBackup = TextUtils.isEmpty(backupIntent); // /e/ Do NOT display Backup & reset item for the moment. useDefaultBackup = false; setTileEnabled(new ComponentName(packageName, Settings.PrivacySettingsActivity.class.getName()), useDefaultBackup, isAdmin, pm); boolean hasBackupActivity = false; Loading @@ -1180,6 +1183,9 @@ public class SettingsActivity extends SettingsDrawerActivity Log.e(LOG_TAG, "Invalid backup intent URI!", e); } } // /e/ Do NOT display Backup & reset item for the moment. hasBackupActivity = false; setTileEnabled(new ComponentName(packageName, BackupSettingsActivity.class.getName()), hasBackupActivity, isAdmin || Utils.isCarrierDemoUser(this), pm); Loading Loading
src/com/android/settings/PrivacySettings.java +3 −1 Original line number Diff line number Diff line Loading @@ -81,7 +81,9 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index super.onCreate(savedInstanceState); // Don't allow any access if this is not an admin user. // TODO: backup/restore currently only works with owner user b/22760572 mEnabled = UserManager.get(getActivity()).isAdminUser(); // /e/ Do NOT display Backup & reset item for the moment. mEnabled = false;//UserManager.get(getActivity()).isAdminUser(); if (!mEnabled) { return; } Loading
src/com/android/settings/SettingsActivity.java +6 −0 Original line number Diff line number Diff line Loading @@ -1169,6 +1169,9 @@ public class SettingsActivity extends SettingsDrawerActivity String backupIntent = getResources().getString(R.string.config_backup_settings_intent); boolean useDefaultBackup = TextUtils.isEmpty(backupIntent); // /e/ Do NOT display Backup & reset item for the moment. useDefaultBackup = false; setTileEnabled(new ComponentName(packageName, Settings.PrivacySettingsActivity.class.getName()), useDefaultBackup, isAdmin, pm); boolean hasBackupActivity = false; Loading @@ -1180,6 +1183,9 @@ public class SettingsActivity extends SettingsDrawerActivity Log.e(LOG_TAG, "Invalid backup intent URI!", e); } } // /e/ Do NOT display Backup & reset item for the moment. hasBackupActivity = false; setTileEnabled(new ComponentName(packageName, BackupSettingsActivity.class.getName()), hasBackupActivity, isAdmin || Utils.isCarrierDemoUser(this), pm); Loading