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

Offer a null FignerprintManager.

Browse Source 
Settings likes null.

Test: builds
Bug: 32060380
Change-Id: I5ba19bccfd48916d4e581518928a6aee19e84a77
This commit is contained in:
Jeff Sharkey
2016-10-11 14:25:22 -06:00
parent b2cca091c9
commit ab50807d1e
11 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/fingerprint/FingerprintSettings.java
View File

@@ -26,6 +26,7 @@ import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.hardware.fingerprint.Fingerprint;
@@ -290,8 +291,7 @@ public class FingerprintSettings extends SubSettings {
Intent.EXTRA_USER_ID, UserHandle.myUserId());
Activity activity = getActivity();
mFingerprintManager = (FingerprintManager) activity.getSystemService(
Context.FINGERPRINT_SERVICE);
mFingerprintManager = Utils.getFingerprintManagerOrNull(activity);
// Need to authenticate a session token if none
if (mToken == null && mLaunchedConfirm == false) {
@@ -820,8 +820,7 @@ public class FingerprintSettings extends SubSettings {
}
public static Preference getFingerprintPreferenceForUser(Context context, final int userId) {
FingerprintManager fpm = (FingerprintManager) context.getSystemService(
Context.FINGERPRINT_SERVICE);
final FingerprintManager fpm = Utils.getFingerprintManagerOrNull(context);
if (fpm == null || !fpm.isHardwareDetected()) {
Log.v(TAG, "No fingerprint hardware detected!!");
return null;