Merge "Fix readImmediately for CTS" into pi-dev am: ec328eea49 (8e46f400) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecom/Connection.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -854,6 +854,8 @@ public abstract class Connection extends Conferenceable {
		private final OutputStreamWriter mPipeToInCall;
		private final ParcelFileDescriptor mFdFromInCall;
		private final ParcelFileDescriptor mFdToInCall;

		private final FileInputStream mFromInCallFileInputStream;
		private char[] mReadBuffer = new char[READ_BUFFER_SIZE];

		/**
		@@ -862,11 +864,11 @@ public abstract class Connection extends Conferenceable {
		public RttTextStream(ParcelFileDescriptor toInCall, ParcelFileDescriptor fromInCall) {
		mFdFromInCall = fromInCall;
		mFdToInCall = toInCall;
		mFromInCallFileInputStream = new FileInputStream(fromInCall.getFileDescriptor());

		// Wrap the FileInputStream in a Channel so that it's interruptible.
		mPipeFromInCall = new InputStreamReader(
		Channels.newInputStream(Channels.newChannel(
		new FileInputStream(fromInCall.getFileDescriptor()))));
		Channels.newInputStream(Channels.newChannel(mFromInCallFileInputStream)));
		mPipeToInCall = new OutputStreamWriter(
		new FileOutputStream(toInCall.getFileDescriptor()));
		}
		@@ -914,7 +916,7 @@ public abstract class Connection extends Conferenceable {
		* not entered any new text yet.
		*/
		public String readImmediately() throws IOException {
		if (mPipeFromInCall.ready()) {
		if (mFromInCallFileInputStream.available() > 0) {
		return read();
		} else {
		return null;