Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47355cb2 authored by Jim Miller's avatar Jim Miller Committed by android-build-merger
Browse files

Merge "Fix operator precedence bug causing a crash." into nyc-dev am: 8df94000 

am: 63faadde

* commit '63faadde':
  Fix operator precedence bug causing a crash.

Change-Id: Ia2f1aa120dde4d8ad88837c5150ab68b4271ed16
parents 5b5ac1c5 63faadde

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

+1 −1
Original line number Diff line number Diff line
@@ -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);