Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add more robust handling of daemon crashes"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-23 02:22:22 +00:00
committed by Android (Google) Code Review
parent 166422317d 8eddd33a01
commit c7798c4f00
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/fingerprint/FingerprintService.java
View File

@@ -217,6 +217,7 @@ public class FingerprintService extends SystemService implements IHwBinder.Death
public synchronized IBiometricsFingerprint getFingerprintDaemon() {
if (mDaemon == null) {
Slog.v(TAG, "mDeamon was null, reconnect to fingerprint");
try {
mDaemon = IBiometricsFingerprint.getService();
} catch (java.util.NoSuchElementException e) {
@@ -292,6 +293,13 @@ public class FingerprintService extends SystemService implements IHwBinder.Death
startClient(mPendingClient, false);
mPendingClient = null;
}
} else if (error == FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE) {
// If we get HW_UNAVAILABLE, try to connect again later...
Slog.w(TAG, "Got ERROR_HW_UNAVAILABLE; try reconnecting next client.");
synchronized (this) {
mDaemon = null;
mHalDeviceId = 0;
}
}
}
@@ -995,7 +1003,8 @@ public class FingerprintService extends SystemService implements IHwBinder.Death
Binder.getCallingUid(), Binder.getCallingPid())) {
return false;
}
return mHalDeviceId != 0;
IBiometricsFingerprint daemon = getFingerprintDaemon();
return daemon != null && mHalDeviceId != 0;
}
@Override // Binder call