Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0666a127 authored by Chandan Nath's avatar Chandan Nath Committed by Android (Google) Code Review
Browse files

Merge "[Multi-user] Show Backup only if Backup is activated"

parents 3d5ef5ec 4d626f63

src/com/android/settings/SettingsActivity.java

+8 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ import androidx.preference.PreferenceManager; 
import com.android.internal.util.ArrayUtils;

import com.android.settings.Settings.WifiSettingsActivity;

import com.android.settings.applications.manageapplications.ManageApplications;

import com.android.settings.backup.BackupSettingsHelper;

import com.android.settings.backup.UserBackupSettingsActivity;

import com.android.settings.core.OnActivityResultListener;

import com.android.settings.core.SettingsBaseActivity;

import com.android.settings.core.SubSettingLauncher;
@@ -630,6 +632,12 @@ public class SettingsActivity extends SettingsBaseActivity 
                showDev, isAdmin)

                || somethingChanged;



        // Enable/disable backup settings depending on whether backup is activated for the user.

        boolean isBackupActive = new BackupSettingsHelper(this).isBackupServiceActive();

        somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,

                UserBackupSettingsActivity.class.getName()), isBackupActive, isAdmin)

                || somethingChanged;



        somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,

                        Settings.WifiDisplaySettingsActivity.class.getName()),

                WifiDisplaySettings.isAvailable(this), isAdmin)

src/com/android/settings/backup/BackupSettingsHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ public class BackupSettingsHelper { 
    }



    /** Checks if backup service is enabled for this user. */

    private boolean isBackupServiceActive() {

    public boolean isBackupServiceActive() {

        boolean backupOkay;

        try {

            backupOkay = mBackupManager.isBackupServiceActive(UserHandle.myUserId());