Merge "Fix operator precedence bug causing a crash." into nyc-dev

2016-04-18 21:09:51 +00:00
parent de5dbec3ab c1e61b83c2
commit 8df940000d
1 changed files with 1 additions and 1 deletions
--- 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);