PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the failing PreferenceControllerContractTest"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-08 19:15:29 +00:00
committed by Android (Google) Code Review
parent 28ad28d4be 7b08531b6a
commit b4d8ccdf86
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/biometrics/face/FaceSettings.java
View File

@@ -156,6 +156,9 @@ public class FaceSettings extends DashboardFragment {
@Override @Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
if (!isAvailable(context)) {
return null;
}
final List<AbstractPreferenceController> controllers = final List<AbstractPreferenceController> controllers =
buildPreferenceControllers(context, getSettingsLifecycle()); buildPreferenceControllers(context, getSettingsLifecycle());
// There's no great way of doing this right now :/ // There's no great way of doing this right now :/
@@ -197,7 +200,11 @@ public class FaceSettings extends DashboardFragment {
@Override @Override
public List<AbstractPreferenceController> createPreferenceControllers( public List<AbstractPreferenceController> createPreferenceControllers(
Context context) { Context context) {
if (isAvailable(context)) {
return buildPreferenceControllers(context, null /* lifecycle */); return buildPreferenceControllers(context, null /* lifecycle */);
} else {
return null;
}
} }
@Override @Override