summaryrefslogtreecommitdiffstats
path: root/services/core/java
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-01-28 18:19:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-28 18:19:50 +0000
commite0d1e295f15a5c70ca030732fd9309f0dc50b2cc (patch)
tree66688889ad519fb56fff65ac47a966ca9b5e6aba /services/core/java
parent3b02fe19c3512db7337beafd534a943bdf624039 (diff)
parentaf17925f94c3a293022a4c41fc284a0a9312dcb6 (diff)
downloadframeworks_base-e0d1e295f15a5c70ca030732fd9309f0dc50b2cc.zip
frameworks_base-e0d1e295f15a5c70ca030732fd9309f0dc50b2cc.tar.gz
frameworks_base-e0d1e295f15a5c70ca030732fd9309f0dc50b2cc.tar.bz2
am af17925f: am 45b68ac3: am 09325627: am 245b58d6: am baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager"
* commit 'af17925f94c3a293022a4c41fc284a0a9312dcb6': [ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
Diffstat (limited to 'services/core/java')
-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 4d863dc..70d85fc 100755
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -1099,6 +1099,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) {