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

Commit 557ed7aa authored by Joe Onorato's avatar Joe Onorato Committed by Android Git Automerger
Browse files

am 0457db37: am ab2e6284: Merge "Use the private version of userActivity." into gingerbread 

Merge commit '0457db37'

* commit '0457db37':
  Use the private version of userActivity.
parents 9664b241 0457db37

services/java/com/android/server/PowerManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ class PowerManagerService extends IPowerManager.Stub 
            mWakeLockState = mLocks.gatherState();

            // goes in the middle to reduce flicker

            if ((wl.flags & PowerManager.ON_AFTER_RELEASE) != 0) {

                userActivity(SystemClock.uptimeMillis(), false);

                userActivity(SystemClock.uptimeMillis(), -1, false, OTHER_EVENT, false);

            }

            setPowerState(mWakeLockState | mUserState);

        }