diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-03-02 17:12:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-02 17:12:11 +0000 |
| commit | d6391e36fbe0a7c4b92bccfd578e338fed5b40d6 (patch) | |
| tree | 3955662b61a80da8db39a0d6fb43d9a8a53301eb | |
| parent | 45cef352e06ea518337bf5840bc949369deeb599 (diff) | |
| parent | c88bdc76bf419808c2e07b69b5b0f2974100ddad (diff) | |
Merge "Fix some Dialer tests"
| -rw-r--r-- | src/com/android/dialer/util/PrivilegedCallUtil.java | 4 | ||||
| -rw-r--r-- | tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java | 2 | ||||
| -rw-r--r-- | tests/src/com/android/dialer/util/TestConstants.java | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/dialer/util/PrivilegedCallUtil.java b/src/com/android/dialer/util/PrivilegedCallUtil.java index 88adc725e..367f36566 100644 --- a/src/com/android/dialer/util/PrivilegedCallUtil.java +++ b/src/com/android/dialer/util/PrivilegedCallUtil.java @@ -32,6 +32,8 @@ import com.android.phone.common.PhoneConstants; */ public class PrivilegedCallUtil { + public static final String CALL_ACTION = Intent.ACTION_CALL_PRIVILEGED; + /** * Return an Intent for making a phone call. Scheme (e.g. tel, sip) will be determined * automatically. @@ -129,7 +131,7 @@ public class PrivilegedCallUtil { */ public static Intent getCallIntent( Uri uri, String callOrigin, PhoneAccountHandle accountHandle, int videoState) { - final Intent intent = new Intent(Intent.ACTION_CALL_PRIVILEGED, uri); + final Intent intent = new Intent(CALL_ACTION, uri); intent.putExtra(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE, videoState); if (callOrigin != null) { intent.putExtra(PhoneConstants.EXTRA_CALL_ORIGIN, callOrigin); diff --git a/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java b/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java index 7ae2c2293..df4247b8e 100644 --- a/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java +++ b/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java @@ -239,7 +239,7 @@ public class PhoneCallDetailsHelperTest extends AndroidTestCase { public void testSetCallDetailsHeader_PayphoneNumber() { setCallDetailsHeaderWithNumber("", Calls.PRESENTATION_PAYPHONE); assertEquals(View.VISIBLE, mNameView.getVisibility()); - assertEquals("Pay phone", mNameView.getText().toString()); + assertEquals("Payphone", mNameView.getText().toString()); } public void testSetCallDetailsHeader_VoicemailNumber() { diff --git a/tests/src/com/android/dialer/util/TestConstants.java b/tests/src/com/android/dialer/util/TestConstants.java index 780626a27..ff4a2faad 100644 --- a/tests/src/com/android/dialer/util/TestConstants.java +++ b/tests/src/com/android/dialer/util/TestConstants.java @@ -1,7 +1,5 @@ package com.android.dialer.util; -import android.content.Intent; - public class TestConstants { - public static final String CALL_INTENT_ACTION = Intent.ACTION_CALL; + public static final String CALL_INTENT_ACTION = PrivilegedCallUtil.CALL_ACTION; } |