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

Merge cherrypicks of [7201114] into qt-release

Browse Source 
Change-Id: Ibb151929a8ccfefb344088aae2062f87f3d0495a
This commit is contained in:
android-build-team Robot
2019-04-25 23:27:21 +00:00
parent 1266e9ed85 8db50b7e36
commit 1ae8b700a9
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceController.java
View File

@@ -22,6 +22,8 @@ import android.content.Context;
import android.hardware.face.FaceManager; import android.hardware.face.FaceManager;
import android.provider.Settings; import android.provider.Settings;
import com.android.settings.Utils;
import androidx.preference.Preference; import androidx.preference.Preference;
/** /**
@@ -40,7 +42,7 @@ public class FaceSettingsAppPreferenceController extends FaceSettingsPreferenceC
public FaceSettingsAppPreferenceController(Context context, String preferenceKey) { public FaceSettingsAppPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey); super(context, preferenceKey);
mFaceManager = context.getSystemService(FaceManager.class); mFaceManager = Utils.getFaceManagerOrNull(context);
} }
public FaceSettingsAppPreferenceController(Context context) { public FaceSettingsAppPreferenceController(Context context) {

3
src/com/android/settings/biometrics/face/FaceSettingsConfirmPreferenceController.java
View File

@@ -24,6 +24,7 @@ import android.provider.Settings;
import androidx.preference.Preference; import androidx.preference.Preference;
import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
/** /**
@@ -46,7 +47,7 @@ public class FaceSettingsConfirmPreferenceController extends FaceSettingsPrefere
public FaceSettingsConfirmPreferenceController(Context context, public FaceSettingsConfirmPreferenceController(Context context,
String preferenceKey) { String preferenceKey) {
super(context, preferenceKey); super(context, preferenceKey);
mFaceManager = context.getSystemService(FaceManager.class); mFaceManager = Utils.getFaceManagerOrNull(context);
} }
@Override @Override

3
src/com/android/settings/biometrics/face/FaceSettingsKeyguardPreferenceController.java
View File

@@ -26,6 +26,7 @@ import android.provider.Settings;
import androidx.preference.Preference; import androidx.preference.Preference;
import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
/** /**
@@ -44,7 +45,7 @@ public class FaceSettingsKeyguardPreferenceController extends FaceSettingsPrefer
public FaceSettingsKeyguardPreferenceController(Context context, String preferenceKey) { public FaceSettingsKeyguardPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey); super(context, preferenceKey);
mFaceManager = context.getSystemService(FaceManager.class); mFaceManager = Utils.getFaceManagerOrNull(context);
} }
public FaceSettingsKeyguardPreferenceController(Context context) { public FaceSettingsKeyguardPreferenceController(Context context) {