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

Commit 7b08531b authored by Antony Sargent's avatar Antony Sargent
Browse files

Fix the failing PreferenceControllerContractTest 

In FaceSettings.SearchIndexProvider's createPreferenceControllers
method, we need to check isAvailable() before trying to create the
controllers.

Bug: 127852616
Test: runtest --path ./tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
Change-Id: Ib05ba05b8752583eeda61ded78f08f7998d48ba7
parent 2f825120

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

+8 −1
Original line number Diff line number Diff line
@@ -156,6 +156,9 @@ public class FaceSettings extends DashboardFragment { 


    @Override

    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

        if (!isAvailable(context)) {

            return null;

        }

        final List<AbstractPreferenceController> controllers =

                buildPreferenceControllers(context, getSettingsLifecycle());

        // There's no great way of doing this right now :/
@@ -197,7 +200,11 @@ public class FaceSettings extends DashboardFragment { 
                @Override

                public List<AbstractPreferenceController> createPreferenceControllers(

                        Context context) {

                    if (isAvailable(context)) {

                        return buildPreferenceControllers(context, null /* lifecycle */);

                    } else {

                        return null;

                    }

                }



                @Override