diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-01-22 13:06:48 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-22 13:06:48 -0800 |
| commit | f36af16479e252bec168ed181885ec21d9df46f5 (patch) | |
| tree | df7e0b343072a4a9d66cc84353698e61c3d702e4 /core/java/android | |
| parent | 5503d803ecee63d417128d3849717b59b971fc08 (diff) | |
| parent | 842e04b221048668e468cc06f09c9d18a39cbd3f (diff) | |
| download | frameworks_base-f36af16479e252bec168ed181885ec21d9df46f5.zip frameworks_base-f36af16479e252bec168ed181885ec21d9df46f5.tar.gz frameworks_base-f36af16479e252bec168ed181885ec21d9df46f5.tar.bz2 | |
Merge "Whoops, actually exclude pre-HC apps." into honeycomb
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index e400a1f..511ddc1 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -2628,12 +2628,12 @@ public final class ActivityThread { ActivityClientRecord r = mActivities.get(token); if (r == null) { - Log.w(TAG, "handleWindowVisibility: no activity for token " + token); + Log.w(TAG, "handleSleeping: no activity for token " + token); return; } if (sleeping) { - if (!r.stopped) { + if (!r.stopped && !r.isPreHoneycomb()) { try { // Now we are idle. r.activity.performStop(); |