diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-12-21 20:40:11 -0800 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2010-12-21 23:23:26 -0800 |
commit | 5f4d6433463078687bcc9e7a421efb28644440ab (patch) | |
tree | f86ccc53b0557a193acae348229ee9bb27fa2d55 /services | |
parent | f642c89964c9f53c22d0b0f12e33849a93ffbcb2 (diff) | |
download | frameworks_base-5f4d6433463078687bcc9e7a421efb28644440ab.zip frameworks_base-5f4d6433463078687bcc9e7a421efb28644440ab.tar.gz frameworks_base-5f4d6433463078687bcc9e7a421efb28644440ab.tar.bz2 |
Fix issue #3263026: Screen rotation animation is funky...
...with more than one activity visible
Change-Id: I7695108a3540f5dd0a59b792ca3bc84c8f680872
Diffstat (limited to 'services')
-rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 12 | ||||
-rw-r--r-- | services/java/com/android/server/am/ActivityRecord.java | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index b308f69..4cf01aa 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -129,7 +129,6 @@ import java.io.InputStreamReader; import java.io.PrintWriter; import java.lang.IllegalStateException; import java.lang.ref.WeakReference; -import java.net.InetSocketAddress; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -11750,14 +11749,9 @@ public final class ActivityManagerService extends ActivityManagerNative if (starting != null) { kept = mMainStack.ensureActivityConfigurationLocked(starting, changes); - if (kept) { - // If this didn't result in the starting activity being - // destroyed, then we need to make sure at this point that all - // other activities are made visible. - if (DEBUG_SWITCH) Slog.i(TAG, "Config didn't destroy " + starting - + ", ensuring others are correct."); - mMainStack.ensureActivitiesVisibleLocked(starting, changes); - } + // And we need to make sure at this point that all other activities + // are made visible with the correct configuration. + mMainStack.ensureActivitiesVisibleLocked(starting, changes); } if (values != null && mWindowManager != null) { diff --git a/services/java/com/android/server/am/ActivityRecord.java b/services/java/com/android/server/am/ActivityRecord.java index b4e426f..caaae1f 100644 --- a/services/java/com/android/server/am/ActivityRecord.java +++ b/services/java/com/android/server/am/ActivityRecord.java @@ -413,7 +413,7 @@ class ActivityRecord extends IApplicationToken.Stub { // an application, and that application is not blocked or unresponding. // In any other case, we can't count on getting the screen unfrozen, // so it is best to leave as-is. - return app == null || (!app.crashing && !app.notResponding); + return app != null && !app.crashing && !app.notResponding; } public void startFreezingScreenLocked(ProcessRecord app, int configChanges) { |