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

Merge "Work on issue #5144065: Tap on Music icon from Home screen - a different app opens"

Browse Source
This commit is contained in:
Dianne Hackborn
2011-09-09 14:53:53 -07:00
committed by Android (Google) Code Review
parent 104f6a07c9 e5ba16a7af
commit e123612c08
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3327,20 +3327,28 @@ public final class ActivityManagerService extends ActivityManagerNative
boolean didSomething = killPackageProcessesLocked(name, uid, -100,
callerWillRestart, false, doit, evenPersistent);
for (i=mMainStack.mHistory.size()-1; i>=0; i--) {
TaskRecord lastTask = null;
for (i=0; i<mMainStack.mHistory.size(); i++) {
ActivityRecord r = (ActivityRecord)mMainStack.mHistory.get(i);
if (r.packageName.equals(name)
final boolean samePackage = r.packageName.equals(name);
if ((samePackage || r.task == lastTask)
&& (r.app == null || evenPersistent || !r.app.persistent)) {
if (!doit) {
return true;
}
didSomething = true;
Slog.i(TAG, " Force finishing activity " + r);
if (r.app != null) {
r.app.removed = true;
if (samePackage) {
if (r.app != null) {
r.app.removed = true;
}
r.app = null;
}
lastTask = r.task;
if (r.stack.finishActivityLocked(r, i, Activity.RESULT_CANCELED,
null, "force-stop")) {
i--;
}
r.app = null;
r.stack.finishActivityLocked(r, i, Activity.RESULT_CANCELED, null, "uninstall");
}
}