commit bfddc0fe77f9b943bd35ab525c50f5ce9d7390f4
author Dianne Hackborn <hackbod@google.com> Tue Dec 14 11:28:01 2010 -0800
committer Dianne Hackborn <hackbod@google.com> Tue Dec 14 11:28:01 2010 -0800
tree 3b52d62ee9b62c0a0e8c57f163a200ee398a4a6e
parent f2e69a911aa4d8ebaa3ffb6bc025a5ea5fea4bac

Work around issue #3241701: crash in ActivityThread.handleWindowVisibility

Change-Id: I9d5df3605f3d216e651e0a294409f82dea3968ad

core/java/android/app/ActivityThread.java

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 43f9d52..cc94aa0 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -2592,6 +2592,12 @@
 
     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) {