From c1e61b83c2fc3fa7a7111ec72081a8fa647bc354 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Mon, 18 Apr 2016 13:00:40 -0700 Subject: [PATCH] Fix operator precedence bug causing a crash. This fixes a bug where string expression was being evaluated and then compared to null. The result is a constant expression which always passes, resulting in inadvertently accessing the null variable. Fixes bug 28237450 Change-Id: I755b4466fd1985bd7f8984c17e06839ac4a30642 --- .../java/com/android/server/fingerprint/FingerprintService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java index 2dafa3e8a1c02..c770620873e22 100644 --- a/services/core/java/com/android/server/fingerprint/FingerprintService.java +++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java @@ -222,7 +222,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe removeClient(client); } if (DEBUG) Slog.v(TAG, "handleError(client=" - + client != null ? client.getOwnerString() : "null" + ", error = " + error + ")"); + + (client != null ? client.getOwnerString() : "null") + ", error = " + error + ")"); // This is the magic code that starts the next client when the old client finishes. if (error == FingerprintManager.FINGERPRINT_ERROR_CANCELED) { mHandler.removeCallbacks(mResetClientState);