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

Commit bcf3fc62 authored by Marie Matheson's avatar Marie Matheson Committed by Android (Google) Code Review
Browse files

Merge "Make host type in ChangeScreenLockPreferenceController more generic." into sc-dev

parents 98ad383e 35fd9edd

src/com/android/settings/security/ChangeScreenLockPreferenceController.java

+3 −2
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import androidx.preference.PreferenceScreen; 


import com.android.internal.widget.LockPatternUtils;

import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.Utils;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.core.SubSettingLauncher;
@@ -48,7 +49,7 @@ public class ChangeScreenLockPreferenceController extends AbstractPreferenceCont 
    private static final String KEY_UNLOCK_SET_OR_CHANGE = "unlock_set_or_change";



    protected final DevicePolicyManager mDPM;

    protected final SecuritySettings mHost;

    protected final SettingsPreferenceFragment mHost;

    protected final UserManager mUm;

    protected final LockPatternUtils mLockPatternUtils;
@@ -58,7 +59,7 @@ public class ChangeScreenLockPreferenceController extends AbstractPreferenceCont 


    protected RestrictedPreference mPreference;



    public ChangeScreenLockPreferenceController(Context context, SecuritySettings host) {

    public ChangeScreenLockPreferenceController(Context context, SettingsPreferenceFragment host) {

        super(context);

        mUm = (UserManager) context.getSystemService(Context.USER_SERVICE);

        mDPM = (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);