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

Merge "FileBridge needs to keep strong reference to PFD." into lmp-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2014-08-29 06:52:54 +00:00
committed by Android (Google) Code Review
parent f8a823b05a 9a1507aa10
commit c62f2e1bb7
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/pm/PackageInstaller.java
View File

@@ -623,7 +623,7 @@ public class PackageInstaller {
try {
final ParcelFileDescriptor clientSocket = mSession.openWrite(name,
offsetBytes, lengthBytes);
return new FileBridge.FileBridgeOutputStream(clientSocket.getFileDescriptor());
return new FileBridge.FileBridgeOutputStream(clientSocket);
} catch (RuntimeException e) {
ExceptionUtils.maybeUnwrapIOException(e);
throw e;

6
core/java/android/os/FileBridge.java
View File

@@ -131,11 +131,13 @@ public class FileBridge extends Thread {
}
public static class FileBridgeOutputStream extends OutputStream {
private final ParcelFileDescriptor mClientPfd;
private final FileDescriptor mClient;
private final byte[] mTemp = new byte[MSG_LENGTH];
public FileBridgeOutputStream(FileDescriptor client) {
mClient = client;
public FileBridgeOutputStream(ParcelFileDescriptor clientPfd) {
mClientPfd = clientPfd;
mClient = clientPfd.getFileDescriptor();
}
@Override