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

Commit 417c61f7 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-8cd2a23c-f767-488e-8139-390d1636483f-for-git_oc-mr1-release-43... 

release-request-8cd2a23c-f767-488e-8139-390d1636483f-for-git_oc-mr1-release-4323561 snap-temp-L80400000100600189

Change-Id: I81a6906e82780885b683a16fcb0d4a1ac9531d1c
parents c6f499e4 377cda6b

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+2 −0
Original line number Diff line number Diff line
@@ -1855,6 +1855,8 @@ public class GsmCdmaPhone extends Phone { 


    @Override

    public void setTTYMode(int ttyMode, Message onComplete) {

        // Send out the TTY Mode change over RIL as well

        super.setTTYMode(ttyMode, onComplete);

        if (mImsPhone != null) {

            mImsPhone.setTTYMode(ttyMode, onComplete);

        }

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+0 −1
Original line number Diff line number Diff line
@@ -713,7 +713,6 @@ public class ImsPhone extends ImsPhoneBase { 


    @Override

    public void setTTYMode(int ttyMode, Message onComplete) {

        super.setTTYMode(ttyMode, onComplete);

        mCT.setTtyMode(ttyMode);

    }

tests/telephonytests/src/com/android/internal/telephony/PhoneNumberUtilsTest.java

+18 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.support.test.filters.FlakyTest; 
import android.telephony.PhoneNumberUtils;

import android.test.suitebuilder.annotation.SmallTest;

import android.text.SpannableStringBuilder;

import android.text.style.TtsSpan;



import org.junit.Ignore;

import org.junit.Test;
@@ -751,4 +752,21 @@ public class PhoneNumberUtilsTest { 
        assertEquals("tim_123", PhoneNumberUtils.getUsernameFromUriNumber("tim_123@zzz.org"));

        assertEquals("5103331245", PhoneNumberUtils.getUsernameFromUriNumber("5103331245"));

    }



    @SmallTest

    @Test

    public void testCreateTtsSpan() {

        checkTtsNumber("650 555 1212", "650-555-1212");

        checkTtsNumber("6505551212", "+1-650-555-1212");

        checkTtsNumber("232", "232");

        checkTtsNumber("*232", "*232");

        checkTtsNumber("*232#", "*232#");

        checkTtsNumber("*650 555 1212#", "*650-555-1212#");

    }



    private void checkTtsNumber(String expected, String sourceNumber) {

        TtsSpan ttsSpan = PhoneNumberUtils.createTtsSpan(sourceNumber);

        assertEquals(TtsSpan.TYPE_TELEPHONE, ttsSpan.getType());

        assertEquals(expected, ttsSpan.getArgs().getString(TtsSpan.ARG_NUMBER_PARTS));

    }

}