diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-12-14 17:47:39 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-14 17:47:39 -0800 |
| commit | 7ab7d83254050cb237bf285a39b455a5aa3b4c97 (patch) | |
| tree | a0e1f8b5a6f7a02d4afa885b819ecbd1cf81cd4b /core/java/android/app | |
| parent | bb3e4cf97378a87bf665ef03b508b9ff88a5d127 (diff) | |
| parent | bfddc0fe77f9b943bd35ab525c50f5ce9d7390f4 (diff) | |
| download | frameworks_base-7ab7d83254050cb237bf285a39b455a5aa3b4c97.zip frameworks_base-7ab7d83254050cb237bf285a39b455a5aa3b4c97.tar.gz frameworks_base-7ab7d83254050cb237bf285a39b455a5aa3b4c97.tar.bz2 | |
Merge "Work around issue #3241701: crash in ActivityThread.handleWindowVisibility"
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 6 |
1 files changed, 6 insertions, 0 deletions
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 @@ 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) { |