Merge "Work around issue #3241701: crash in ActivityThread.handleWindowVisibility"

2010-12-14 17:47:39 -08:00
parent bb3e4cf973 bfddc0fe77
commit 7ab7d83254
1 changed files with 6 additions and 0 deletions
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -2592,6 +2592,12 @@ public final class ActivityThread {

    private final void handleWindowVisibility(IBinder token, boolean show) {
        ActivityClientRecord r = mActivities.get(token);
+        
+        if (r == null) {
+            Log.w(TAG, "handleWindowVisibility: no activity for token " + token);
+            return;
+        }
+        
        if (!show && !r.stopped) {
            performStopActivityInner(r, null, show, false);
        } else if (show && r.stopped) {