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

Merge "Merge get-stagedsessions with pm list and improve on it"

Browse Source
This commit is contained in:
Mohammad Samiul Islam
2019-09-06 12:48:31 +00:00
committed by Android (Google) Code Review
parent 10ed94a04f f50641a957
commit 9cb206f225
1 changed files with 107 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
services/core/java/com/android/server/pm/PackageManagerShellCommand.java
View File

@@ -276,7 +276,7 @@ class PackageManagerShellCommand extends ShellCommand {
case "get-harmful-app-warning":
return runGetHarmfulAppWarning();
case "get-stagedsessions":
return getStagedSessions();
return runListStagedSessions();
case "uninstall-system-updates":
return uninstallSystemUpdates();
case "rollback-app":
@@ -348,53 +348,6 @@ class PackageManagerShellCommand extends ShellCommand {
return 1;
}
private int getStagedSessions() {
final IndentingPrintWriter pw = new IndentingPrintWriter(
getOutPrintWriter(), /* singleIndent */ " ", /* wrapLength */ 120);
try {
List<SessionInfo> stagedSessions =
mInterface.getPackageInstaller().getStagedSessions().getList();
final SparseArray<SessionInfo> sessionById = new SparseArray<>(stagedSessions.size());
for (SessionInfo session : stagedSessions) {
sessionById.put(session.getSessionId(), session);
}
for (SessionInfo session: stagedSessions) {
if (session.getParentSessionId() != SessionInfo.INVALID_ID) {
continue;
}
printStagedSession(session, pw);
if (session.isMultiPackage()) {
pw.increaseIndent();
final int[] childIds = session.getChildSessionIds();
for (int i = 0; i < childIds.length; i++) {
final SessionInfo childSession = sessionById.get(childIds[i]);
if (childSession == null) {
pw.println("sessionId = " + childIds[i] + "; not found");
} else {
printStagedSession(childSession, pw);
}
}
pw.decreaseIndent();
}
}
} catch (RemoteException e) {
pw.println("Failure ["
+ e.getClass().getName() + " - "
+ e.getMessage() + "]");
return 0;
}
return 1;
}
private static void printStagedSession(SessionInfo session, PrintWriter pw) {
pw.println("sessionId = " + session.getSessionId()
+ "; appPackageName = " + session.getAppPackageName()
+ "; isStaged = " + session.isStaged()
+ "; isReady = " + session.isStagedSessionReady()
+ "; isApplied = " + session.isStagedSessionApplied()
+ "; isFailed = " + session.isStagedSessionFailed() + ";");
}
private int uninstallSystemUpdates() {
final PrintWriter pw = getOutPrintWriter();
List<String> failedUninstalls = new LinkedList<>();
@@ -567,6 +520,8 @@ class PackageManagerShellCommand extends ShellCommand {
return runListPermissionGroups();
case "permissions":
return runListPermissions();
case "staged-sessions":
return runListStagedSessions();
case "users":
ServiceManager.getService("user").shellCommand(
getInFileDescriptor(), getOutFileDescriptor(), getErrFileDescriptor(),
@@ -904,6 +859,103 @@ class PackageManagerShellCommand extends ShellCommand {
return 0;
}
private static class SessionDump {
boolean onlyParent; // Show parent sessions only
boolean onlyReady; // Show only staged sessions that are in ready state
boolean onlySessionId; // Show sessionId only
}
// Returns true if the provided flag is a session flag and given SessionDump was updated
private boolean setSessionFlag(String flag, SessionDump sessionDump) {
switch (flag) {
case "--only-parent":
sessionDump.onlyParent = true;
break;
case "--only-ready":
sessionDump.onlyReady = true;
break;
case "--only-sessionid":
sessionDump.onlySessionId = true;
break;
default:
return false;
}
return true;
}
private int runListStagedSessions() {
final IndentingPrintWriter pw = new IndentingPrintWriter(
getOutPrintWriter(), /* singleIndent */ " ", /* wrapLength */ 120);
SessionDump sessionDump = new SessionDump();
String opt;
while ((opt = getNextOption()) != null) {
if (!setSessionFlag(opt, sessionDump)) {
pw.println("Error: Unknown option: " + opt);
return -1;
}
}
try {
List<SessionInfo> stagedSessions =
mInterface.getPackageInstaller().getStagedSessions().getList();
printSessionList(pw, stagedSessions, sessionDump);
} catch (RemoteException e) {
pw.println("Failure ["
+ e.getClass().getName() + " - "
+ e.getMessage() + "]");
return -1;
}
return 1;
}
private void printSessionList(IndentingPrintWriter pw, List<SessionInfo> stagedSessions,
SessionDump sessionDump) {
final SparseArray<SessionInfo> sessionById = new SparseArray<>(stagedSessions.size());
for (SessionInfo session : stagedSessions) {
sessionById.put(session.getSessionId(), session);
}
for (SessionInfo session: stagedSessions) {
if (sessionDump.onlyReady && !session.isStagedSessionReady()) {
continue;
}
if (session.getParentSessionId() != SessionInfo.INVALID_ID) {
continue;
}
printSession(pw, session, sessionDump);
if (session.isMultiPackage() && !sessionDump.onlyParent) {
pw.increaseIndent();
final int[] childIds = session.getChildSessionIds();
for (int i = 0; i < childIds.length; i++) {
final SessionInfo childSession = sessionById.get(childIds[i]);
if (childSession == null) {
if (sessionDump.onlySessionId) {
pw.println(childIds[i]);
} else {
pw.println("sessionId = " + childIds[i] + "; not found");
}
} else {
printSession(pw, childSession, sessionDump);
}
}
pw.decreaseIndent();
}
}
}
private static void printSession(PrintWriter pw, SessionInfo session, SessionDump sessionDump) {
if (sessionDump.onlySessionId) {
pw.println(session.getSessionId());
return;
}
pw.println("sessionId = " + session.getSessionId()
+ "; appPackageName = " + session.getAppPackageName()
+ "; isStaged = " + session.isStaged()
+ "; isReady = " + session.isStagedSessionReady()
+ "; isApplied = " + session.isStagedSessionApplied()
+ "; isFailed = " + session.isStagedSessionFailed() + ";");
}
private Intent parseIntentAndUser() throws URISyntaxException {
mTargetUser = UserHandle.USER_CURRENT;
mBrief = false;
@@ -3108,6 +3160,12 @@ class PackageManagerShellCommand extends ShellCommand {
pw.println(" -d: only list dangerous permissions");
pw.println(" -u: list only the permissions users will see");
pw.println("");
pw.println(" list staged-sessions [--only-ready] [--only-sessionid] [--only-parent]");
pw.println(" Displays list of all staged sessions on device.");
pw.println(" --only-ready: show only staged sessions that are ready");
pw.println(" --only-sessionid: show only sessionId of each session");
pw.println(" --only-parent: hide all children sessions");
pw.println("");
pw.println(" resolve-activity [--brief] [--components] [--query-flags FLAGS]");
pw.println(" [--user USER_ID] INTENT");
pw.println(" Prints the activity that resolves to the given INTENT.");
@@ -3345,7 +3403,7 @@ class PackageManagerShellCommand extends ShellCommand {
pw.println(" uninstall-system-updates");
pw.println(" Remove updates to all system applications and fall back to their /system " +
"version.");
pw.println();
pw.println("");
pw.println(" get-moduleinfo [--all | --installed] [module-name]");
pw.println(" Displays module info. If module-name is specified only that info is shown");
pw.println(" By default, without any argument only installed modules are shown.");