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

am 2e9ca0aa: Merge "Fix crash in TranserPipe." into lmp-dev

Browse Source 
* commit '2e9ca0aa3de6f8e6e6691125497248dd6940c5f1':
  Fix crash in TranserPipe.
This commit is contained in:
Ramanan Rajeswaran
2014-09-14 19:29:36 +00:00
committed by Android Git Automerger
parent 1bcd0659b0 2e451c817d
commit 2a25027b18
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/com/android/internal/os/TransferPipe.java
View File

@@ -174,15 +174,27 @@ public final class TransferPipe implements Runnable {
}
public void kill() {
closeFd(0);
closeFd(1);
synchronized (this) {
closeFd(0);
closeFd(1);
}
}
@Override
public void run() {
final byte[] buffer = new byte[1024];
final FileInputStream fis = new FileInputStream(getReadFd().getFileDescriptor());
final FileOutputStream fos = new FileOutputStream(mOutFd);
final FileInputStream fis;
final FileOutputStream fos;
synchronized (this) {
ParcelFileDescriptor readFd = getReadFd();
if (readFd == null) {
Slog.w(TAG, "Pipe has been closed...");
return;
}
fis = new FileInputStream(readFd.getFileDescriptor());
fos = new FileOutputStream(mOutFd);
}
if (DEBUG) Slog.i(TAG, "Ready to read pipe...");
byte[] bufferPrefix = null;