Merge branch 'management-issue-504-n' into 'v1-nougat-sprint_2' (a50471f1) · Commits · e / os / android_packages_apps_Settings

res/xml/privacy_settings.xml

+4 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		android:title="@string/privacy_settings_title">

		<!-- Backup settings -->
		<!-- /e/ Disable Backup entry. 2019/10/08
		<PreferenceScreen
		android:key="backup_data"
		android:title="@string/backup_data_title"
		@@ -28,8 +29,9 @@
		<PreferenceScreen
		android:key="configure_account"
		android:title="@string/backup_configure_account_title"
		android:persistent="false">
		android:persistent="false">-->
		<!-- the Intent declared here is always overwritten by a real one -->
		<!-- /e/ Disable Backup entry. 2019/10/08
		<intent android:action="dummy" />
		</PreferenceScreen>

		@@ -49,7 +51,7 @@
		android:persistent="false"
		android:enabled="false"
		android:selectable="false" />

		-->
		<!-- Factory reset -->
		<com.android.settingslib.RestrictedPreference
		android:key="factory_reset"

src/com/android/settings/PrivacySettings.java

+12 −13

Original line number	Diff line number	Diff line
		@@ -82,15 +82,14 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
		// Don't allow any access if this is not an admin user.
		// TODO: backup/restore currently only works with owner user b/22760572

		// /e/ Do NOT display Backup & reset item for the moment.
		mEnabled = false;//UserManager.get(getActivity()).isAdminUser();
		mEnabled = UserManager.get(getActivity()).isAdminUser();
		if (!mEnabled) {
		return;
		}

		addPreferencesFromResource(R.xml.privacy_settings);
		final PreferenceScreen screen = getPreferenceScreen();
		mBackupManager = IBackupManager.Stub.asInterface(
		/*mBackupManager = IBackupManager.Stub.asInterface(
		ServiceManager.getService(Context.BACKUP_SERVICE));

		mBackup = (PreferenceScreen) screen.findPreference(BACKUP_DATA);
		@@ -99,7 +98,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
		mAutoRestore.setOnPreferenceChangeListener(preferenceChangeListener);

		mConfigure = (PreferenceScreen) screen.findPreference(CONFIGURE_ACCOUNT);
		mManageData = (PreferenceScreen) screen.findPreference(DATA_MANAGEMENT);
		mManageData = (PreferenceScreen) screen.findPreference(DATA_MANAGEMENT);*/

		Set<String> keysToRemove = new HashSet<>();
		getNonVisibleKeys(getActivity(), keysToRemove);
		@@ -111,7 +110,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
		}
		}

		updateToggles();
		//updateToggles();
		}

		@Override
		@@ -119,9 +118,9 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
		super.onResume();

		// Refresh UI
		if (mEnabled) {
		/* if (mEnabled) {
		updateToggles();
		}
		}*/
		}

		private OnPreferenceChangeListener preferenceChangeListener = new OnPreferenceChangeListener() {
		@@ -132,14 +131,14 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
		}
		boolean nextValue = (Boolean) newValue;
		boolean result = false;
		if (preference == mAutoRestore) {
		/*if (preference == mAutoRestore) {
		try {
		mBackupManager.setAutoRestore(nextValue);
		result = true;
		} catch (RemoteException e) {
		mAutoRestore.setChecked(!nextValue);
		}
		}
		}*/
		return result;
		}
		};
		@@ -265,7 +264,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
		}

		private static void getNonVisibleKeys(Context context, Collection<String> nonVisibleKeys) {
		final IBackupManager backupManager = IBackupManager.Stub.asInterface(
		/*final IBackupManager backupManager = IBackupManager.Stub.asInterface(
		ServiceManager.getService(Context.BACKUP_SERVICE));
		boolean isServiceActive = false;
		try {
		@@ -273,17 +272,17 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
		} catch (RemoteException e) {
		Log.w(TAG, "Failed querying backup manager service activity status. " +
		"Assuming it is inactive.");
		}
		}*/
		boolean vendorSpecific = context.getPackageManager().
		resolveContentProvider(GSETTINGS_PROVIDER, 0) == null;
		if (vendorSpecific \|\| isServiceActive) {
		/*if (vendorSpecific \|\| isServiceActive) {
		nonVisibleKeys.add(BACKUP_INACTIVE);
		}
		if (vendorSpecific \|\| !isServiceActive) {
		nonVisibleKeys.add(BACKUP_DATA);
		nonVisibleKeys.add(AUTO_RESTORE);
		nonVisibleKeys.add(CONFIGURE_ACCOUNT);
		}
		}*/
		if (RestrictedLockUtils.hasBaseUserRestriction(context,
		UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) {
		nonVisibleKeys.add(FACTORY_RESET);

src/com/android/settings/SettingsActivity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1175,7 +1175,7 @@ public class SettingsActivity extends SettingsDrawerActivity
		boolean useDefaultBackup = TextUtils.isEmpty(backupIntent);

		// /e/ Do NOT display Backup & reset item for the moment.
		useDefaultBackup = false;
		//useDefaultBackup = false;
		setTileEnabled(new ComponentName(packageName,
		Settings.PrivacySettingsActivity.class.getName()), useDefaultBackup, isAdmin, pm);
		boolean hasBackupActivity = false;