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

Commit e674e950 authored by Adrian Roos's avatar Adrian Roos Committed by Android Git Automerger
Browse files

am 9fb98375: am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev

* commit '9fb98375':
  Touch, wake and unlock
parents 1e06d4c6 9fb98375
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -576,12 +576,6 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
                result |= true; // we have a valid fingerprint
                mLockoutReset.run();
            }
            // 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 (authenticated) {
                mPowerManager.wakeUp(SystemClock.uptimeMillis(),
                        "android.server.fingerprint:AUTH");
            }
            return result;
        }