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

Commit e42440cc authored by Hall Liu's avatar Hall Liu Committed by Gerrit Code Review
Browse files

Merge "Do not set PROPERTY_IS_RTT in testapps"

parents 8d9aaa29 847e6658

testapps/src/com/android/server/telecom/testapps/RttChatbot.java

+6 −1
Original line number Diff line number Diff line
@@ -116,7 +116,12 @@ public class RttChatbot { 
        mHandler = new ReplyHandler(ht.getLooper());

        mReceiverThread = new Thread(() -> {

            while (true) {

                String charsReceived = mRttTextStream.read();

                String charsReceived;

                try {

                    charsReceived = mRttTextStream.read();

                } catch (IOException e) {

                    break;

                }

                if (charsReceived == null) {

                    if (Thread.currentThread().isInterrupted()) {

                        Log.w(LOG_TAG, "Thread interrupted");

testapps/src/com/android/server/telecom/testapps/TestConnectionService.java

+0 −2
Original line number Diff line number Diff line
@@ -286,7 +286,6 @@ public class TestConnectionService extends ConnectionService { 
            if (rttTextStream != null) {

                mRttChatbot = new RttChatbot(getApplicationContext(), rttTextStream);

                mRttChatbot.start();

                setConnectionProperties(getConnectionProperties() | PROPERTY_IS_RTT);

                sendRttInitiationSuccess();

            }

        }
@@ -298,7 +297,6 @@ public class TestConnectionService extends ConnectionService { 
                Log.i(this, "Accepting RTT request.");

                mRttChatbot = new RttChatbot(getApplicationContext(), textStream);

                mRttChatbot.start();

                setConnectionProperties(getConnectionProperties() | PROPERTY_IS_RTT);

                sendRttInitiationSuccess();

            } else {

                sendRttInitiationFailure(RttModifyStatus.SESSION_MODIFY_REQUEST_FAIL);

testapps/src/com/android/server/telecom/testapps/TestRttActivity.java

+6 −1
Original line number Diff line number Diff line
@@ -93,7 +93,12 @@ public class TestRttActivity extends Activity { 
                    }

                    // inner read loop

                    while (true) {

                        String receivedText = rttCall.read();

                        String receivedText;

                        try {

                            receivedText = rttCall.read();

                        } catch (IOException e) {

                            break;

                        }

                        if (receivedText == null) {

                            if (Thread.currentThread().isInterrupted()) {

                                break begin;