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

Merge "[ActivityManager] Avoid keeping restarting home when only home activity exists."

Browse Source
This commit is contained in:
Craig Mautner
2014-07-07 16:34:06 +00:00
committed by Gerrit Code Review
parent c66da9d606 3145b24902
commit ef2e76675a
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/am/ActivityStack.java
View File

@@ -3370,6 +3370,7 @@ final class ActivityStack {
boolean forceStopPackageLocked(String name, boolean doit, boolean evenPersistent, int userId) { boolean forceStopPackageLocked(String name, boolean doit, boolean evenPersistent, int userId) {
boolean didSomething = false; boolean didSomething = false;
TaskRecord lastTask = null; TaskRecord lastTask = null;
ComponentName homeActivity = null;
for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) { for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {
final ArrayList<ActivityRecord> activities = mTaskHistory.get(taskNdx).mActivities; final ArrayList<ActivityRecord> activities = mTaskHistory.get(taskNdx).mActivities;
int numActivities = activities.size(); int numActivities = activities.size();
@@ -3388,6 +3389,14 @@ final class ActivityStack {
} }
return true; return true;
} }
if (r.isHomeActivity()) {
if (homeActivity != null && homeActivity.equals(r.realActivity)) {
Slog.i(TAG, "Skip force-stop again " + r);
continue;
} else {
homeActivity = r.realActivity;
}
}
didSomething = true; didSomething = true;
Slog.i(TAG, " Force finishing activity " + r); Slog.i(TAG, " Force finishing activity " + r);
if (samePackage) { if (samePackage) {