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

Commit b4d8ccdf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix the failing PreferenceControllerContractTest"

parents 28ad28d4 7b08531b

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