Merge "Whoops, actually exclude pre-HC apps." into honeycomb

2011-01-22 13:06:48 -08:00
parent 5503d803ec 842e04b221
commit f36af16479
1 changed files with 2 additions and 2 deletions
--- 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();