Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '24c1d664c4f95a8c997bfc4683844e05b788c3db':
  Remove an unnecessary condition from previous change.
This commit is contained in:
Jeff Brown
2014-11-13 20:58:19 +00:00
committed by Android Git Automerger
parent 72f1e3b9c9 24c1d664c4
commit cb906677fc
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/power/PowerManagerService.java
View File

@@ -1466,8 +1466,7 @@ public final class PowerManagerService extends SystemService
private void updateUserActivitySummaryLocked(long now, int dirty) { private void updateUserActivitySummaryLocked(long now, int dirty) {
// Update the status of the user activity timeout timer. // Update the status of the user activity timeout timer.
if ((dirty & (DIRTY_WAKE_LOCKS | DIRTY_USER_ACTIVITY if ((dirty & (DIRTY_WAKE_LOCKS | DIRTY_USER_ACTIVITY
| DIRTY_WAKEFULNESS | DIRTY_SETTINGS | DIRTY_WAKEFULNESS | DIRTY_SETTINGS)) != 0) {
| DIRTY_SCREEN_BRIGHTNESS_BOOST)) != 0) {
mHandler.removeMessages(MSG_USER_ACTIVITY_TIMEOUT); mHandler.removeMessages(MSG_USER_ACTIVITY_TIMEOUT);
long nextTimeout = 0; long nextTimeout = 0;