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

am: 8df9400

* commit '8df940000ddf82e4268350abe6b1cf4be375160c':
  Fix operator precedence bug causing a crash.

Change-Id: I5224b47e58bc884c3ee75b4abc0540332906b581

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);