Merge "Shuffle FD ownership? \noideadog" (46331602) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerShellCommand.java

+21 −21

Original line number	Diff line number	Diff line
		@@ -2418,10 +2418,12 @@ class PackageManagerShellCommand extends ShellCommand {

		private int doWriteSplit(int sessionId, String inPath, long sizeBytes, String splitName,
		boolean logSuccess) throws RemoteException {
		PackageInstaller.Session session = null;
		try {
		final PrintWriter pw = getOutPrintWriter();
		final ParcelFileDescriptor fd;
		if (STDIN_PATH.equals(inPath)) {
		fd = new ParcelFileDescriptor(getInFileDescriptor());
		fd = ParcelFileDescriptor.dup(getInFileDescriptor());
		} else if (inPath != null) {
		fd = openFileForSystem(inPath, "r");
		if (fd == null) {
		@@ -2433,15 +2435,13 @@ class PackageManagerShellCommand extends ShellCommand {
		return -1;
		}
		} else {
		fd = new ParcelFileDescriptor(getInFileDescriptor());
		fd = ParcelFileDescriptor.dup(getInFileDescriptor());
		}
		if (sizeBytes <= 0) {
		getErrPrintWriter().println("Error: must specify a APK size");
		return 1;
		}

		PackageInstaller.Session session = null;
		try {
		session = new PackageInstaller.Session(
		mInterface.getPackageInstaller().openSession(sessionId));
		session.write(splitName, 0, sizeBytes, fd);