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

Simplify debug command to force compactions

Browse Source 
This removes the need to specify the UID as part of the command

Bug: 262442634
Test: am compact full <package_name>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:94ea572a57d4d5328d2e4b53582a7ea692a39a79)
Merged-In: I3fa2d9bcc14e4ce31e8825d5a029f5768553f4fc
Change-Id: I3fa2d9bcc14e4ce31e8825d5a029f5768553f4fc
This commit is contained in:
Edgar Arriaga
2022-12-13 23:00:29 +00:00
committed by Cherrypicker Worker
parent 29a79cf724
commit 6cc5e38394
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/am/ActivityManagerShellCommand.java
View File

@@ -1066,16 +1066,26 @@ final class ActivityManagerShellCommand extends ShellCommand {
}
@NeverCompile
int runCompact(PrintWriter pw) {
int runCompact(PrintWriter pw) throws RemoteException {
ProcessRecord app;
String op = getNextArgRequired();
boolean isFullCompact = op.equals("full");
boolean isSomeCompact = op.equals("some");
if (isFullCompact || isSomeCompact) {
String processName = getNextArgRequired();
String uid = getNextArgRequired();
synchronized (mInternal.mProcLock) {
app = mInternal.getProcessRecordLocked(processName, Integer.parseInt(uid));
// Default to current user
int userId = mInterface.getCurrentUserId();
String userOpt = getNextOption();
if (userOpt != null && "--user".equals(userOpt)) {
int inputUserId = UserHandle.parseUserArg(getNextArgRequired());
if (inputUserId != UserHandle.USER_CURRENT) {
userId = inputUserId;
}
}
final int uid =
mInternal.getPackageManagerInternal().getPackageUid(processName, 0, userId);
app = mInternal.getProcessRecordLocked(processName, uid);
}
pw.println("Process record found pid: " + app.mPid);
if (isFullCompact) {
@@ -4018,7 +4028,7 @@ final class ActivityManagerShellCommand extends ShellCommand {
pw.println(" --allow-background-activity-starts: The receiver may start activities");
pw.println(" even if in the background.");
pw.println(" --async: Send without waiting for the completion of the receiver.");
pw.println(" compact [some|full|system] <process_name> <Package UID>");
pw.println(" compact [some|full|system] <process_name> [--user <USER_ID>]");
pw.println(" Force process compaction.");
pw.println(" some: execute file compaction.");
pw.println(" full: execute anon + file compaction.");