Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'f36af16479e252bec168ed181885ec21d9df46f5':
  Whoops, actually exclude pre-HC apps.
This commit is contained in:
Dianne Hackborn
2011-01-22 13:09:01 -08:00
committed by Android Git Automerger
parent 8a0f175600 f36af16479
commit db4e32fe68
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/ActivityThread.java
View File

@@ -2664,12 +2664,12 @@ public final class ActivityThread {
ActivityClientRecord r = mActivities.get(token); ActivityClientRecord r = mActivities.get(token);
if (r == null) { if (r == null) {
Log.w(TAG, "handleWindowVisibility: no activity for token " + token); Log.w(TAG, "handleSleeping: no activity for token " + token);
return; return;
} }
if (sleeping) { if (sleeping) {
if (!r.stopped) { if (!r.stopped && !r.isPreHoneycomb()) {
try { try {
// Now we are idle. // Now we are idle.
r.activity.performStop(); r.activity.performStop();