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

am 67c5b125: Merge "Fix issue #5321282: Force Stop Button in Battery Screen Not disabled correctly"

Browse Source 
* commit '67c5b1251178532726964c2e0f4229d079ff0a3e':
  Fix issue #5321282: Force Stop Button in Battery Screen Not disabled correctly
This commit is contained in:
Dianne Hackborn
2011-09-23 12:58:33 -07:00
committed by Android Git Automerger
parent e327fe4611 67c5b12511
commit 04d98fb638
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -3344,6 +3344,11 @@ public final class ActivityManagerService extends ActivityManagerNative
if ((samePackage || r.task == lastTask)
&& (r.app == null || evenPersistent || !r.app.persistent)) {
if (!doit) {
if (r.finishing) {
// If this activity is just finishing, then it is not
// interesting as far as something to stop.
continue;
}
return true;
}
didSomething = true;
@@ -3409,6 +3414,7 @@ public final class ActivityManagerService extends ActivityManagerNative
}
}
mMainStack.resumeTopActivityLocked(null);
mMainStack.scheduleIdleLocked();
}
return didSomething;