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

Merge "Dump orphaned sessions is separate block"

Browse Source
This commit is contained in:
Mohammad Samiul Islam
2020-08-18 09:46:25 +00:00
committed by Android (Google) Code Review
parent a0640ea9cc b221b040c9
commit d965f65fc1
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/core/java/com/android/server/pm/PackageInstallerService.java
View File

@@ -1284,14 +1284,21 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
pw.increaseIndent();
List<PackageInstallerSession> finalizedSessions = new ArrayList<>();
List<PackageInstallerSession> orphanedChildSessions = new ArrayList<>();
int N = mSessions.size();
for (int i = 0; i < N; i++) {
final PackageInstallerSession session = mSessions.valueAt(i);
// Do not print finalized staged session as active install sessions
final PackageInstallerSession rootSession = session.hasParentSessionId()
? getSession(session.getParentSessionId())
: session;
// Do not print orphaned child sessions as active install sessions
if (rootSession == null) {
orphanedChildSessions.add(session);
continue;
}
// Do not print finalized staged session as active install sessions
if (rootSession.isStagedAndInTerminalState()) {
finalizedSessions.add(session);
continue;
@@ -1303,6 +1310,21 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
pw.println();
pw.decreaseIndent();
if (!orphanedChildSessions.isEmpty()) {
// Presence of orphaned sessions indicate leak in cleanup for multi-package and
// should be cleaned up.
pw.println("Orphaned install sessions:");
pw.increaseIndent();
N = orphanedChildSessions.size();
for (int i = 0; i < N; i++) {
final PackageInstallerSession session = orphanedChildSessions.get(i);
session.dump(pw);
pw.println();
}
pw.println();
pw.decreaseIndent();
}
pw.println("Finalized install sessions:");
pw.increaseIndent();
N = finalizedSessions.size();