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

Commit 4ed55488 authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Android (Google) Code Review
Browse files

Merge "Fixed biometric setting crash." into main

parents 6bc92efa a900c1dd

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

+3 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ import com.android.settingslib.widget.TwoTargetPreference; 
import com.google.android.setupdesign.util.DeviceHelper;



import java.util.ArrayList;

import java.util.Collections;

import java.util.HashMap;

import java.util.List;
@@ -876,6 +877,8 @@ public class FingerprintSettings extends SubSettings { 
        @Override

        protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

            if (!isFingerprintHardwareDetected(context)) {

                Log.e(TAG, "Fingerprint hardware is not detected");

                mControllers = Collections.emptyList();

                return null;

            }

tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsFragmentTest.java

+7 −0
Original line number Diff line number Diff line
@@ -262,6 +262,13 @@ public class FingerprintSettingsFragmentTest { 
        mFragment.onResume();

    }



    @Test

    public void testFragmentVisibleWhenNoHardwareDetected() {

        doReturn(false).when(mFingerprintManager).isHardwareDetected();

        setUpFragment(false);

        assertThat(mFragment.isVisible()).isTrue();

    }



    private void setSensor(@FingerprintSensorProperties.SensorType int sensorType) {

        final ArrayList<FingerprintSensorPropertiesInternal> props = new ArrayList<>();

        props.add(new FingerprintSensorPropertiesInternal(