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

Merge "Make the removal in finish-package-activities deterministic"

Browse Source
This commit is contained in:
Riddle Hsu
2020-08-24 07:33:06 +00:00
committed by Android (Google) Code Review
parent 0ff16e484b a431c22fda
commit 14e52c37df
1 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -3124,7 +3124,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
FinishDisabledPackageActivitiesHelper mFinishDisabledPackageActivitiesHelper =
new FinishDisabledPackageActivitiesHelper();
class FinishDisabledPackageActivitiesHelper {
private boolean mDidSomething;
private String mPackageName;
private Set<String> mFilterByClasses;
private boolean mDoit;
@@ -3132,11 +3131,10 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
private int mUserId;
private boolean mOnlyRemoveNoProcess;
private Task mLastTask;
private ComponentName mHomeActivity;
private final ArrayList<ActivityRecord> mCollectedActivities = new ArrayList<>();
private void reset(String packageName, Set<String> filterByClasses,
boolean doit, boolean evenPersistent, int userId, boolean onlyRemoveNoProcess) {
mDidSomething = false;
mPackageName = packageName;
mFilterByClasses = filterByClasses;
mDoit = doit;
@@ -3144,7 +3142,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
mUserId = userId;
mOnlyRemoveNoProcess = onlyRemoveNoProcess;
mLastTask = null;
mHomeActivity = null;
}
boolean process(String packageName, Set<String> filterByClasses,
@@ -3152,14 +3149,35 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
reset(packageName, filterByClasses, doit, evenPersistent, userId, onlyRemoveNoProcess);
final PooledFunction f = PooledLambda.obtainFunction(
FinishDisabledPackageActivitiesHelper::processActivity, this,
FinishDisabledPackageActivitiesHelper::collectActivity, this,
PooledLambda.__(ActivityRecord.class));
forAllActivities(f);
f.recycle();
return mDidSomething;
boolean didSomething = false;
final int size = mCollectedActivities.size();
// Keep the finishing order from top to bottom.
for (int i = 0; i < size; i++) {
final ActivityRecord r = mCollectedActivities.get(i);
if (mOnlyRemoveNoProcess) {
if (!r.hasProcess()) {
didSomething = true;
Slog.i(TAG, " Force removing " + r);
r.cleanUp(false /* cleanServices */, false /* setState */);
r.removeFromHistory("force-stop");
}
} else {
didSomething = true;
Slog.i(TAG, " Force finishing " + r);
r.finishIfPossible("force-stop", true /* oomAdj */);
}
}
mCollectedActivities.clear();
return didSomething;
}
private boolean processActivity(ActivityRecord r) {
private boolean collectActivity(ActivityRecord r) {
final boolean sameComponent =
(r.packageName.equals(mPackageName) && (mFilterByClasses == null
|| mFilterByClasses.contains(r.mActivityComponent.getClassName())))
@@ -3176,26 +3194,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
}
return true;
}
if (r.isActivityTypeHome()) {
if (mHomeActivity != null && mHomeActivity.equals(r.mActivityComponent)) {
Slog.i(TAG, "Skip force-stop again " + r);
return false;
} else {
mHomeActivity = r.mActivityComponent;
}
}
if (mOnlyRemoveNoProcess) {
if (noProcess) {
mDidSomething = true;
Slog.i(TAG, " Force removing " + r);
r.cleanUp(false /* cleanServices */, false /* setState */);
r.removeFromHistory("force-stop");
}
} else {
mDidSomething = true;
Slog.i(TAG, " Force finishing " + r);
r.finishIfPossible("force-stop", true /* oomAdj */);
}
mCollectedActivities.add(r);
mLastTask = r.getTask();
}