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

Commit ab2e6284 authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

Merge "Use the private version of userActivity." into gingerbread

parents 8b28441a a39ccb6c

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);

        }