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

Commit 8888d346 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge changes I74d677dc,I17f4db85 into qt-dev 

* changes:
  Only gray out remove button after positive button is pressed
  Check PackageManager before getting system service
parents 30991963 f19fb6fa

src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceController.java

+3 −1
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ import android.content.Context; 
import android.hardware.face.FaceManager;

import android.provider.Settings;



import com.android.settings.Utils;



import androidx.preference.Preference;



/**
@@ -40,7 +42,7 @@ public class FaceSettingsAppPreferenceController extends FaceSettingsPreferenceC 


    public FaceSettingsAppPreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);

        mFaceManager = context.getSystemService(FaceManager.class);

        mFaceManager = Utils.getFaceManagerOrNull(context);

    }



    public FaceSettingsAppPreferenceController(Context context) {

src/com/android/settings/biometrics/face/FaceSettingsConfirmPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.provider.Settings; 


import androidx.preference.Preference;



import com.android.settings.Utils;

import com.android.settings.core.TogglePreferenceController;



/**
@@ -46,7 +47,7 @@ public class FaceSettingsConfirmPreferenceController extends FaceSettingsPrefere 
    public FaceSettingsConfirmPreferenceController(Context context,

            String preferenceKey) {

        super(context, preferenceKey);

        mFaceManager = context.getSystemService(FaceManager.class);

        mFaceManager = Utils.getFaceManagerOrNull(context);

    }



    @Override

src/com/android/settings/biometrics/face/FaceSettingsKeyguardPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.provider.Settings; 


import androidx.preference.Preference;



import com.android.settings.Utils;

import com.android.settings.core.TogglePreferenceController;



/**
@@ -44,7 +45,7 @@ public class FaceSettingsKeyguardPreferenceController extends FaceSettingsPrefer 


    public FaceSettingsKeyguardPreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);

        mFaceManager = context.getSystemService(FaceManager.class);

        mFaceManager = Utils.getFaceManagerOrNull(context);

    }



    public FaceSettingsKeyguardPreferenceController(Context context) {

src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference 
        @Override

        public void onClick(DialogInterface dialog, int which) {

            if (which == DialogInterface.BUTTON_POSITIVE) {

                mButton.setEnabled(false);

                final List<Face> faces = mFaceManager.getEnrolledFaces(mUserId);

                if (faces.isEmpty()) {

                    Log.e(TAG, "No faces");
@@ -177,7 +178,6 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference 
    public void onClick(View v) {

        if (v == mButton) {

            mRemoving = true;

            mButton.setEnabled(false);

            ConfirmRemoveDialog dialog = new ConfirmRemoveDialog();

            dialog.setOnClickListener(mOnClickListener);

            dialog.show(mActivity.getSupportFragmentManager(), ConfirmRemoveDialog.class.getName());