commit b4d8ccdf86b50304bf7fee33b35ac90799e90805
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 08 19:15:29 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 08 19:15:29 2019 +0000
tree 56aefa89c26e9d146ed26f6cb0d5a61e351d9ae8
parent 28ad28d4be11fd2d4b81635db2be4f9fea9f6afa
parent 7b08531b6a7ac0c74b522deb696c2ddea8667389

Merge "Fix the failing PreferenceControllerContractTest"

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

diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java
index 490580d..ea5a303 100644
--- a/src/com/android/settings/biometrics/face/FaceSettings.java
+++ b/src/com/android/settings/biometrics/face/FaceSettings.java
@@ -156,6 +156,9 @@
 
     @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 @@
                 @Override
                 public List<AbstractPreferenceController> createPreferenceControllers(
                         Context context) {
-                    return buildPreferenceControllers(context, null /* lifecycle */);
+                    if (isAvailable(context)) {
+                        return buildPreferenceControllers(context, null /* lifecycle */);
+                    } else {
+                        return null;
+                    }
                 }
 
                 @Override