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

Commit 6eade79f authored by Jeff Brown's avatar Jeff Brown
Browse files

Ignore ON_AFTER_RELEASE for partial wake locks. 

This is a regression in the new power manager.  Apparently
some apps try to use ON_AFTER_RELEASE with partial wake locks
which doesn't make sense.  Ignore the flag just like we used to
prior to JB MR1.

Bug: 10336375
Change-Id: Ib307eb60201612ba9bb03dc4da3365aba0b4848d
parent 20e28753

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

+4 −3
Original line number Diff line number Diff line
@@ -650,8 +650,8 @@ public final class PowerManagerService extends IPowerManager.Stub 
    }



    private void applyWakeLockFlagsOnAcquireLocked(WakeLock wakeLock) {

        if ((wakeLock.mFlags & PowerManager.ACQUIRE_CAUSES_WAKEUP) != 0 &&

                isScreenLock(wakeLock)) {

        if ((wakeLock.mFlags & PowerManager.ACQUIRE_CAUSES_WAKEUP) != 0

                && isScreenLock(wakeLock)) {

            wakeUpNoUpdateLocked(SystemClock.uptimeMillis());

        }

    }
@@ -725,7 +725,8 @@ public final class PowerManagerService extends IPowerManager.Stub 
    }



    private void applyWakeLockFlagsOnReleaseLocked(WakeLock wakeLock) {

        if ((wakeLock.mFlags & PowerManager.ON_AFTER_RELEASE) != 0) {

        if ((wakeLock.mFlags & PowerManager.ON_AFTER_RELEASE) != 0

                && isScreenLock(wakeLock)) {

            userActivityNoUpdateLocked(SystemClock.uptimeMillis(),

                    PowerManager.USER_ACTIVITY_EVENT_OTHER,

                    PowerManager.USER_ACTIVITY_FLAG_NO_CHANGE_LIGHTS,