From aa82051811533412f6204987a7dca3a3f567edf3 Mon Sep 17 00:00:00 2001
From: Alex Salo <asalo@google.com>
Date: Fri, 6 Mar 2020 18:40:58 -0800
Subject: [PATCH] Fix Screen Attention reporting ABSENT twice

AttentionDetector should not be called when the screen policy is DIM.

Bug: 150338359
Test: atest AttentionDetectorTest + manually confirmed with logging
Change-Id: Ia58f9f5618fd1aca71e55e3299412cde16308da2
---
 .../java/com/android/server/power/PowerManagerService.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index 5a3464d8a35f6..764ac969e1881 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -2338,8 +2338,7 @@ public final class PowerManagerService extends SystemService
                     nextTimeout = -1;
                 }
 
-                if (((mUserActivitySummary & USER_ACTIVITY_SCREEN_BRIGHT) != 0
-                        || (mUserActivitySummary & USER_ACTIVITY_SCREEN_DIM) != 0)
+                if ((mUserActivitySummary & USER_ACTIVITY_SCREEN_BRIGHT) != 0
                         && (mWakeLockSummary & WAKE_LOCK_STAY_AWAKE) == 0) {
                     nextTimeout = mAttentionDetector.updateUserActivity(nextTimeout,
                             screenDimDuration);