Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 730a2599 authored by Hall Liu's avatar Hall Liu
Browse files

Make RttTextStream's read interruptible 

Wrap the FileInputStream in a java.nio.Channel so that sending a
Thread.interrupt() to the thread blocked on the read will actually do
something.

Change-Id: Icc11ba69167f448e2b33d9a1a13a1dfa5e5d0d58
Fixes: 110570772
Test: manual (follow repro steps in bug, but type really fast),treehugger
parent d7c87b74

telecomm/java/android/telecom/Connection.java

+5 −1
Original line number Diff line number Diff line
@@ -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()));

        }