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

Commit bd825f40 authored by android-build-team Robot's avatar android-build-team Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE during unit test"

parents db9c8d3b 16de45d8

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

+4 −6
Original line number Diff line number Diff line
@@ -22,12 +22,13 @@ import android.content.Context; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.provider.Settings;

import androidx.preference.SwitchPreference;

import androidx.preference.Preference;

import android.util.Log;



import com.android.settings.core.TogglePreferenceController;



import androidx.preference.Preference;

import androidx.preference.SwitchPreference;



public class AutoRestorePreferenceController extends TogglePreferenceController {

    private static final String TAG = "AutoRestorePrefCtrler";
@@ -36,10 +37,7 @@ public class AutoRestorePreferenceController extends TogglePreferenceController 


    public AutoRestorePreferenceController(Context context, String key) {

        super(context, key);

    }



    public void setPrivacySettingsConfigData(final PrivacySettingsConfigData pData) {

        mPSCD = pData;

        mPSCD = PrivacySettingsConfigData.getInstance();

    }



    @Override

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

+4 −6
Original line number Diff line number Diff line
@@ -17,20 +17,18 @@ 
package com.android.settings.backup;



import android.content.Context;

import androidx.preference.Preference;



import com.android.settings.core.BasePreferenceController;

import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;



import androidx.preference.Preference;



public class BackupDataPreferenceController extends BasePreferenceController {

    private PrivacySettingsConfigData mPSCD;



    public BackupDataPreferenceController(Context context, String key) {

        super(context, key);

    }



    public void setPrivacySettingsConfigData(final PrivacySettingsConfigData pData) {

        mPSCD = pData;

        mPSCD = PrivacySettingsConfigData.getInstance();

    }



    @Override

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

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.content.Intent; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.UserHandle;

import androidx.annotation.VisibleForTesting;

import android.util.Log;



import com.android.settings.R;
@@ -32,6 +31,8 @@ import com.android.settings.Settings.PrivacySettingsActivity; 


import java.net.URISyntaxException;



import androidx.annotation.VisibleForTesting;



/**

 * Helper class for {@link BackupSettingsActivity} that interacts with {@link IBackupManager}.

 */

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

+4 −6
Original line number Diff line number Diff line
@@ -18,20 +18,18 @@ package com.android.settings.backup; 


import android.content.Context;

import android.content.Intent;

import androidx.preference.Preference;



import com.android.settings.core.BasePreferenceController;

import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;



import androidx.preference.Preference;



public class ConfigureAccountPreferenceController extends BasePreferenceController {

    private PrivacySettingsConfigData mPSCD;



    public ConfigureAccountPreferenceController(Context context, String key) {

        super(context, key);

    }



    public void setPrivacySettingsConfigData(final PrivacySettingsConfigData pData) {

        mPSCD = pData;

        mPSCD = PrivacySettingsConfigData.getInstance();

    }



    @Override

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

+12 −14
Original line number Diff line number Diff line
@@ -17,21 +17,17 @@ 
package com.android.settings.backup;



import android.content.Context;

import androidx.preference.Preference;



import com.android.settings.core.BasePreferenceController;



import androidx.preference.Preference;



public class DataManagementPreferenceController extends BasePreferenceController {

    private PrivacySettingsConfigData mPSCD;

    private boolean mManageEnabled;



    public DataManagementPreferenceController(Context context, String key) {

        super(context, key);

    }



    public void setPrivacySettingsConfigData(final PrivacySettingsConfigData pData) {

        mPSCD = pData;

        mManageEnabled = (mPSCD.getManageIntent() != null) && mPSCD.isBackupEnabled();

        mPSCD = PrivacySettingsConfigData.getInstance();

    }



    @Override
@@ -39,7 +35,8 @@ public class DataManagementPreferenceController extends BasePreferenceController 
        if (!PrivacySettingsUtils.isAdminUser(mContext)) {

            return DISABLED_FOR_USER;

        }

        if (!mManageEnabled) {

        boolean manageEnabled = (mPSCD.getManageIntent() != null) && mPSCD.isBackupEnabled();

        if (!manageEnabled) {

            return DISABLED_UNSUPPORTED;

        }

        return AVAILABLE;
@@ -47,7 +44,9 @@ public class DataManagementPreferenceController extends BasePreferenceController 


    @Override

    public void updateState(Preference preference) {

        if (mManageEnabled) {

        if (!isAvailable()) {

            return;

        }

        preference.setIntent(mPSCD.getManageIntent());

        final String manageLabel = mPSCD.getManageLabel();

        if (manageLabel != null) {
@@ -55,4 +54,3 @@ public class DataManagementPreferenceController extends BasePreferenceController 
        }

    }

}
 
 No newline at end of file
 
}
 
 No newline at end of file