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

Commit b9d04915 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Call userActivity when dismissing keyguard 

So we don't run into weird race conditions which could leave Keyguard
unlocked.

Also add some missing debug statements for future investigation.

Change-Id: I7bd463f594d53ddfa84cebc28cf1f63dd2d6c533
Fixes: 28987945
parent 8437fce5

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -1386,6 +1386,7 @@ public class KeyguardViewMediator extends SystemUI { 
    public void keyguardDone(boolean authenticated) {

    public void keyguardDone(boolean authenticated) {

        Trace.beginSection("KeyguardViewMediator#keyguardDone");

        Trace.beginSection("KeyguardViewMediator#keyguardDone");

        if (DEBUG) Log.d(TAG, "keyguardDone(" + authenticated +")");

        if (DEBUG) Log.d(TAG, "keyguardDone(" + authenticated +")");

        userActivity();

        EventLog.writeEvent(70000, 2);

        EventLog.writeEvent(70000, 2);

        Message msg = mHandler.obtainMessage(KEYGUARD_DONE, authenticated ? 1 : 0);

        Message msg = mHandler.obtainMessage(KEYGUARD_DONE, authenticated ? 1 : 0);

        mHandler.sendMessage(msg);

        mHandler.sendMessage(msg);
@@ -1643,6 +1644,7 @@ public class KeyguardViewMediator extends SystemUI { 
        @Override

        @Override

        public void run() {

        public void run() {

            Trace.beginSection("KeyguardViewMediator.mKeyGuardGoingAwayRunnable");

            Trace.beginSection("KeyguardViewMediator.mKeyGuardGoingAwayRunnable");

            if (DEBUG) Log.d(TAG, "keyguardGoingAway");

            try {

            try {

                mStatusBarKeyguardViewManager.keyguardGoingAway();

                mStatusBarKeyguardViewManager.keyguardGoingAway();
@@ -1714,6 +1716,8 @@ public class KeyguardViewMediator extends SystemUI { 




    private void handleStartKeyguardExitAnimation(long startTime, long fadeoutDuration) {

    private void handleStartKeyguardExitAnimation(long startTime, long fadeoutDuration) {

        Trace.beginSection("KeyguardViewMediator#handleStartKeyguardExitAnimation");

        Trace.beginSection("KeyguardViewMediator#handleStartKeyguardExitAnimation");

        if (DEBUG) Log.d(TAG, "handleStartKeyguardExitAnimation startTime=" + startTime

                + " fadeoutDuration=" + fadeoutDuration);

        synchronized (KeyguardViewMediator.this) {

        synchronized (KeyguardViewMediator.this) {





            if (!mHiding) {

            if (!mHiding) {