Merge "Log before stopping/removing the current client" into pi-dev (299c18fe) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/fingerprint/FingerprintService.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -225,16 +225,17 @@ public class FingerprintService extends SystemService implements IHwBinder.Death
		if (!(mCurrentClient instanceof AuthenticationClient)) {
		return;
		}
		if (isKeyguard(mCurrentClient.getOwnerString())) {
		final String currentClient = mCurrentClient.getOwnerString();
		if (isKeyguard(currentClient)) {
		return; // Keyguard is always allowed
		}
		List<ActivityManager.RunningTaskInfo> runningTasks = mActivityManager.getTasks(1);
		if (!runningTasks.isEmpty()) {
		final String topPackage = runningTasks.get(0).topActivity.getPackageName();
		if (!topPackage.contentEquals(mCurrentClient.getOwnerString())) {
		mCurrentClient.stop(false /* initiatedByClient */);
		if (!topPackage.contentEquals(currentClient)) {
		Slog.e(TAG, "Stopping background authentication, top: " + topPackage
		+ " currentClient: " + mCurrentClient.getOwnerString());
		+ " currentClient: " + currentClient);
		mCurrentClient.stop(false /* initiatedByClient */);
		}
		}
		} catch (RemoteException e) {