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

Merge "Remove redundant cancel events from FingerprintService" into mnc-dev

Browse Source
This commit is contained in:
Vineeta Srivastava
2015-07-16 07:06:52 +00:00
committed by Android (Google) Code Review
parent ea975b122f 80a776e5fe
commit 47e0409062
1 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,6 +86,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
private static final int FINGERPRINT_ACQUIRED_GOOD = 0; private static final int FINGERPRINT_ACQUIRED_GOOD = 0;
Handler mHandler = new Handler() { Handler mHandler = new Handler() {
@Override
public void handleMessage(android.os.Message msg) { public void handleMessage(android.os.Message msg) {
switch (msg.what) { switch (msg.what) {
case MSG_USER_SWITCHING: case MSG_USER_SWITCHING:
@@ -274,7 +275,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
Slog.w(TAG, "enroll: no fingeprintd!"); Slog.w(TAG, "enroll: no fingeprintd!");
return; return;
} }
stopPendingOperations(); stopPendingOperations(true);
mEnrollClient = new ClientMonitor(token, receiver, groupId, restricted); mEnrollClient = new ClientMonitor(token, receiver, groupId, restricted);
final int timeout = (int) (ENROLLMENT_TIMEOUT_MS / MS_PER_SEC); final int timeout = (int) (ENROLLMENT_TIMEOUT_MS / MS_PER_SEC);
try { try {
@@ -315,17 +316,23 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
return 0; return 0;
} }
private void stopPendingOperations() { private void stopPendingOperations(boolean initiatedByClient) {
if (mEnrollClient != null) { if (mEnrollClient != null) {
stopEnrollment(mEnrollClient.token, true); stopEnrollment(mEnrollClient.token, initiatedByClient);
} }
if (mAuthClient != null) { if (mAuthClient != null) {
stopAuthentication(mAuthClient.token, true); stopAuthentication(mAuthClient.token, initiatedByClient);
} }
// mRemoveClient is allowed to continue // mRemoveClient is allowed to continue
} }
void stopEnrollment(IBinder token, boolean notify) { /**
* Stop enrollment in progress and inform client if they initiated it.
*
* @param token token for client
* @param initiatedByClient if this call is the result of client action (e.g. calling cancel)
*/
void stopEnrollment(IBinder token, boolean initiatedByClient) {
IFingerprintDaemon daemon = getFingerprintDaemon(); IFingerprintDaemon daemon = getFingerprintDaemon();
if (daemon == null) { if (daemon == null) {
Slog.w(TAG, "stopEnrollment: no fingeprintd!"); Slog.w(TAG, "stopEnrollment: no fingeprintd!");
@@ -333,15 +340,15 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
} }
final ClientMonitor client = mEnrollClient; final ClientMonitor client = mEnrollClient;
if (client == null || client.token != token) return; if (client == null || client.token != token) return;
try { if (initiatedByClient) {
int result = daemon.cancelEnrollment(); try {
if (result != 0) { int result = daemon.cancelEnrollment();
Slog.w(TAG, "startEnrollCancel failed, result = " + result); if (result != 0) {
Slog.w(TAG, "startEnrollCancel failed, result = " + result);
}
} catch (RemoteException e) {
Slog.e(TAG, "stopEnrollment failed", e);
} }
} catch (RemoteException e) {
Slog.e(TAG, "stopEnrollment failed", e);
}
if (notify) {
client.sendError(FingerprintManager.FINGERPRINT_ERROR_CANCELED); client.sendError(FingerprintManager.FINGERPRINT_ERROR_CANCELED);
} }
removeClient(mEnrollClient); removeClient(mEnrollClient);
@@ -354,7 +361,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
Slog.w(TAG, "startAuthentication: no fingeprintd!"); Slog.w(TAG, "startAuthentication: no fingeprintd!");
return; return;
} }
stopPendingOperations(); stopPendingOperations(true);
mAuthClient = new ClientMonitor(token, receiver, groupId, restricted); mAuthClient = new ClientMonitor(token, receiver, groupId, restricted);
if (inLockoutMode()) { if (inLockoutMode()) {
Slog.v(TAG, "In lockout mode; disallowing authentication"); Slog.v(TAG, "In lockout mode; disallowing authentication");
@@ -374,7 +381,13 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
} }
} }
void stopAuthentication(IBinder token, boolean notify) { /**
* Stop authentication in progress and inform client if they initiated it.
*
* @param token token for client
* @param initiatedByClient if this call is the result of client action (e.g. calling cancel)
*/
void stopAuthentication(IBinder token, boolean initiatedByClient) {
IFingerprintDaemon daemon = getFingerprintDaemon(); IFingerprintDaemon daemon = getFingerprintDaemon();
if (daemon == null) { if (daemon == null) {
Slog.w(TAG, "stopAuthentication: no fingeprintd!"); Slog.w(TAG, "stopAuthentication: no fingeprintd!");
@@ -382,15 +395,15 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
} }
final ClientMonitor client = mAuthClient; final ClientMonitor client = mAuthClient;
if (client == null || client.token != token) return; if (client == null || client.token != token) return;
try { if (initiatedByClient) {
int result = daemon.cancelAuthentication(); try {
if (result != 0) { int result = daemon.cancelAuthentication();
Slog.w(TAG, "stopAuthentication failed, result=" + result); if (result != 0) {
Slog.w(TAG, "stopAuthentication failed, result=" + result);
}
} catch (RemoteException e) {
Slog.e(TAG, "stopAuthentication failed", e);
} }
} catch (RemoteException e) {
Slog.e(TAG, "stopAuthentication failed", e);
}
if (notify) {
client.sendError(FingerprintManager.FINGERPRINT_ERROR_CANCELED); client.sendError(FingerprintManager.FINGERPRINT_ERROR_CANCELED);
} }
removeClient(mAuthClient); removeClient(mAuthClient);
@@ -486,12 +499,14 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
receiver = null; receiver = null;
} }
@Override
public void binderDied() { public void binderDied() {
token = null; token = null;
removeClient(this); removeClient(this);
receiver = null; receiver = null;
} }
@Override
protected void finalize() throws Throwable { protected void finalize() throws Throwable {
try { try {
if (token != null) { if (token != null) {