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

5
src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
View File

@@ -24,6 +24,7 @@ import android.os.UserHandle;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.ChooseLockSettingsHelper;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.fingerprint.FingerprintEnrollSidecar.Listener;
/**
@@ -155,7 +156,7 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
setResult(RESULT_TIMEOUT);
finish();
} else {
FingerprintManager fpm = getSystemService(FingerprintManager.class);
FingerprintManager fpm = Utils.getFingerprintManagerOrNull(this);
int enrolled = fpm.getEnrolledFingerprints().size();
int max = getResources().getInteger(
com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser);
@@ -172,7 +173,7 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
}
private void launchConfirmLock() {
long challenge = getSystemService(FingerprintManager.class).preEnroll();
long challenge = Utils.getFingerprintManagerOrNull(this).preEnroll();
ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
boolean launchedConfirmationActivity = false;
if (mUserId == UserHandle.USER_NULL) {