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

Merge "Make RttTextStream's read interruptible" into pi-dev

Browse Source 
am: 21ef4b3acb

Change-Id: Ifc793a3b59e7e9cc5c09cffa8d147feeb5a6e900
This commit is contained in:
Hall Liu
2018-06-26 15:17:12 -07:00
committed by android-build-merger
parent 273bce2fde 21ef4b3acb
commit 6574cac322
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telecomm/java/android/telecom/Connection.java
View File

@@ -45,6 +45,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.nio.channels.Channels;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -861,8 +862,11 @@ public abstract class Connection extends Conferenceable {
public RttTextStream(ParcelFileDescriptor toInCall, ParcelFileDescriptor fromInCall) {
mFdFromInCall = fromInCall;
mFdToInCall = toInCall;
// Wrap the FileInputStream in a Channel so that it's interruptible.
mPipeFromInCall = new InputStreamReader(
new FileInputStream(fromInCall.getFileDescriptor()));
Channels.newInputStream(Channels.newChannel(
new FileInputStream(fromInCall.getFileDescriptor()))));
mPipeToInCall = new OutputStreamWriter(
new FileOutputStream(toInCall.getFileDescriptor()));
}