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

Merge "Use ParcelFileDescriptor when calling ART commands."

Browse Source
This commit is contained in:
Jiakai Zhang
2022-06-16 08:56:20 +00:00
committed by Android (Google) Code Review
parent 2547975fcf 1ad432e5da
commit 750be2cf60
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3445,9 +3445,14 @@ class PackageManagerShellCommand extends ShellCommand {
// Remove the first arg "art" and forward to ART module.
String[] args = getAllArgs();
args = Arrays.copyOfRange(args, 1, args.length);
return LocalManagerRegistry.getManagerOrThrow(ArtManagerLocal.class)
.handleShellCommand(getTarget(), getInFileDescriptor(), getOutFileDescriptor(),
getErrFileDescriptor(), args);
try (var in = ParcelFileDescriptor.dup(getInFileDescriptor());
var out = ParcelFileDescriptor.dup(getOutFileDescriptor());
var err = ParcelFileDescriptor.dup(getErrFileDescriptor())) {
return LocalManagerRegistry.getManagerOrThrow(ArtManagerLocal.class)
.handleShellCommand(getTarget(), in, out, err, args);
} catch (IOException e) {
throw new IllegalStateException(e);
}
}
private static String checkAbiArgument(String abi) {