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

* commit 'baa370e16b3f71b70641087ea68dd9c991ffbaab': Fix the build
2015-07-16 00:08:26 +00:00
parent 3c5fe9de7f baa370e16b
commit 0483200dc3
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
@@ -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
            // wakes up and turns the screen on when fingerprint is authenticated.
-            if (mIsKeyguard && authenticated) {
+            if (authenticated) {
                mPowerManager.wakeUp(SystemClock.uptimeMillis(),
                        "android.server.fingerprint:AUTH");
            }