summaryrefslogtreecommitdiffstats
path: root/services/core
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-01-28 18:17:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-28 18:17:31 +0000
commitaf17925f94c3a293022a4c41fc284a0a9312dcb6 (patch)
tree7d84cc8b217fb1b728c2510564875420f7e945c7 /services/core
parentbfa3f4fd5c30b0d53addc071ecf8e099529f2c77 (diff)
parent45b68ac3a7acb7af95fdfc5c0e31560b3c28c9f8 (diff)
downloadframeworks_base-af17925f94c3a293022a4c41fc284a0a9312dcb6.zip
frameworks_base-af17925f94c3a293022a4c41fc284a0a9312dcb6.tar.gz
frameworks_base-af17925f94c3a293022a4c41fc284a0a9312dcb6.tar.bz2
am 45b68ac3: am 09325627: am 245b58d6: am baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager"
* commit '45b68ac3a7acb7af95fdfc5c0e31560b3c28c9f8': [ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
Diffstat (limited to 'services/core')
-rwxr-xr-xservices/core/java/com/android/server/am/ActivityStack.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index d689a29..a7b8067 100755
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -1097,6 +1097,7 @@ final class ActivityStack {
if (!r.visible) {
if (DEBUG_VISBILITY) Slog.v(
TAG, "Starting and making visible: " + r);
+ r.visible = true;
mWindowManager.setAppVisibility(r.appToken, true);
}
if (r != starting) {