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

Commit c69191c1 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am cb906677: am 24c1d664: Merge "Remove an unnecessary condition from previous... 

am cb906677: am 24c1d664: Merge "Remove an unnecessary condition from previous change." into lmp-sprout-dev

* commit 'cb906677':
  Remove an unnecessary condition from previous change.
parents 3415634c cb906677

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

+1 −2
Original line number Diff line number Diff line
@@ -1466,8 +1466,7 @@ public final class PowerManagerService extends SystemService 
    private void updateUserActivitySummaryLocked(long now, int dirty) {

        // Update the status of the user activity timeout timer.

        if ((dirty & (DIRTY_WAKE_LOCKS | DIRTY_USER_ACTIVITY

                | DIRTY_WAKEFULNESS | DIRTY_SETTINGS

                | DIRTY_SCREEN_BRIGHTNESS_BOOST)) != 0) {

                | DIRTY_WAKEFULNESS | DIRTY_SETTINGS)) != 0) {

            mHandler.removeMessages(MSG_USER_ACTIVITY_TIMEOUT);



            long nextTimeout = 0;