summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jorim Jaggi <jjaggi@google.com> 2017-08-04 12:07:11 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-08-04 12:07:11 +0000
commit8e9984ee8370f3d7ec7fec16f7f796298d2f75f5 (patch)
tree27f14f6b5103f945779c90195bf5fa7e254392ba
parent19be605910f74bb46d6963dd8df0effa5eca1b3d (diff)
parent6dfd9baff1a6f08eaa66a1febae9116dac35323f (diff)
Merge "Never consider windows visible if appToken is hidden" into oc-dr1-dev
-rw-r--r--services/core/java/com/android/server/wm/AppWindowToken.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java
index 43ba0943cc98..be4b43da0742 100644
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -290,7 +290,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
boolean nowGone = mReportedVisibilityResults.nowGone;
boolean nowDrawn = numInteresting > 0 && numDrawn >= numInteresting;
- boolean nowVisible = numInteresting > 0 && numVisible >= numInteresting;
+ boolean nowVisible = numInteresting > 0 && numVisible >= numInteresting && !hidden;
if (!nowGone) {
// If the app is not yet gone, then it can only become visible/drawn.
if (!nowDrawn) {