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

am 919a3fdf: am 01c5bf54: Merge "Handle driver errors from remove, enroll and auth." into mnc-dr-dev

Browse Source 
* commit '919a3fdf9c92aa232f6304c32227cf0fe99cb8f3':
  Handle driver errors from remove, enroll and auth.
This commit is contained in:
Jim Miller
2015-08-25 23:36:30 +00:00
committed by Android Git Automerger
parent bdb151ea64 919a3fdf9c
commit a1cc380606
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -298,6 +298,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
final int result = daemon.enroll(cryptoToken, groupId, timeout); final int result = daemon.enroll(cryptoToken, groupId, timeout);
if (result != 0) { if (result != 0) {
Slog.w(TAG, "startEnroll failed, result=" + result); Slog.w(TAG, "startEnroll failed, result=" + result);
dispatchError(mHalDeviceId, FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE);
} }
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.e(TAG, "startEnroll failed", e); Slog.e(TAG, "startEnroll failed", e);
@@ -391,6 +392,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
final int result = daemon.authenticate(opId, groupId); final int result = daemon.authenticate(opId, groupId);
if (result != 0) { if (result != 0) {
Slog.w(TAG, "startAuthentication failed, result=" + result); Slog.w(TAG, "startAuthentication failed, result=" + result);
dispatchError(mHalDeviceId, FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE);
} }
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.e(TAG, "startAuthentication failed", e); Slog.e(TAG, "startAuthentication failed", e);
@@ -433,12 +435,14 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
return; return;
} }
stopPendingOperations(true);
mRemoveClient = new ClientMonitor(token, receiver, userId, restricted); mRemoveClient = new ClientMonitor(token, receiver, userId, restricted);
// The fingerprint template ids will be removed when we get confirmation from the HAL // The fingerprint template ids will be removed when we get confirmation from the HAL
try { try {
final int result = daemon.remove(fingerId, userId); final int result = daemon.remove(fingerId, userId);
if (result != 0) { if (result != 0) {
Slog.w(TAG, "startRemove with id = " + fingerId + " failed, result=" + result); Slog.w(TAG, "startRemove with id = " + fingerId + " failed, result=" + result);
dispatchError(mHalDeviceId, FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE);
} }
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.e(TAG, "startRemove failed", e); Slog.e(TAG, "startRemove failed", e);