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

Fix the failing PreferenceControllerContractTest

Browse Source 
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
This commit is contained in:
Antony Sargent
2019-03-07 15:21:33 -08:00
parent 2f825120b0
commit 7b08531b6a
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {
return buildPreferenceControllers(context, null /* lifecycle */);
if (isAvailable(context)) {
return buildPreferenceControllers(context, null /* lifecycle */);
} else {
return null;
}
}
@Override