am 0483200d: am baa370e1: am db19e1de: Merge "Fix the build" into mnc-dr-dev

* commit '0483200dc3c6345487fce09bf8ecaf34b0af89ee':
  Fix the build
This commit is contained in:
Jim Miller
2015-07-16 00:24:10 +00:00
committed by Android Git Automerger

View File

@@ -563,7 +563,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
} }
// For fingerprint devices that support touch-to-wake, this will ensure the device // For fingerprint devices that support touch-to-wake, this will ensure the device
// wakes up and turns the screen on when fingerprint is authenticated. // wakes up and turns the screen on when fingerprint is authenticated.
if (mIsKeyguard && authenticated) { if (authenticated) {
mPowerManager.wakeUp(SystemClock.uptimeMillis(), mPowerManager.wakeUp(SystemClock.uptimeMillis(),
"android.server.fingerprint:AUTH"); "android.server.fingerprint:AUTH");
} }