diff options
author | Yorke Lee <yorkelee@google.com> | 2014-10-28 07:24:24 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-28 07:24:24 +0000 |
commit | 155e158ee9e88bc2fd47fe3383c3ec5253e6413a (patch) | |
tree | def8f56cf05104347fd673af79e573dbc4dd5793 | |
parent | d44e53e983f6cc9eb0aaa3a4f50d1dd19a6b3bfe (diff) | |
parent | 219f1190e49c366676dc65731e42b7905d80bec3 (diff) |
am 219f1190: am 48a8845a: am 7d7591f5: Merge "Fix some broken Dialer tests" into lmp-mr1-dev
* commit '219f1190e49c366676dc65731e42b7905d80bec3':
Fix some broken Dialer tests
4 files changed, 14 insertions, 5 deletions
diff --git a/src/com/android/dialer/util/DialerUtils.java b/src/com/android/dialer/util/DialerUtils.java index 9cd4d9936..10eadffd5 100644 --- a/src/com/android/dialer/util/DialerUtils.java +++ b/src/com/android/dialer/util/DialerUtils.java @@ -71,7 +71,7 @@ public class DialerUtils { */ public static void startActivityWithErrorToast(Context context, Intent intent, int msgId) { try { - if (Intent.ACTION_CALL.equals(intent.getAction())) { + if (Intent.ACTION_CALL.equals(intent.getAction()) && context instanceof Activity) { // All dialer-initiated calls should pass the touch point to the InCallUI Point touchPoint = TouchPointManager.getInstance().getPoint(); if (touchPoint.x != 0 || touchPoint.y != 0) { diff --git a/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java b/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java index e0e111bcf..b88989d4d 100644 --- a/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java +++ b/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java @@ -42,6 +42,7 @@ import android.widget.FrameLayout; import com.android.contacts.common.test.FragmentTestActivity; import com.android.dialer.CallDetailActivity; import com.android.dialer.R; +import com.android.dialer.util.TestConstants; import java.util.Date; import java.util.Formatter; @@ -323,7 +324,7 @@ public class CallLogFragmentTest extends ActivityInstrumentationTestCase2<Fragme IntentProvider intentProvider = (IntentProvider) views.callBackButtonView.getTag(); Intent intent = intentProvider.getIntent(mActivity); // Starts a call. - assertEquals(Intent.ACTION_CALL_PRIVILEGED, intent.getAction()); + assertEquals(TestConstants.CALL_INTENT_ACTION, intent.getAction()); // To the entry's number. assertEquals(Uri.parse("tel:" + TEST_NUMBER), intent.getData()); } @@ -385,7 +386,7 @@ public class CallLogFragmentTest extends ActivityInstrumentationTestCase2<Fragme Intent callIntent = intentProvider.getIntent(mActivity); //The intent should be to make the call - assertEquals(Intent.ACTION_CALL_PRIVILEGED, callIntent.getAction()); + assertEquals(TestConstants.CALL_INTENT_ACTION, callIntent.getAction()); } } } diff --git a/tests/src/com/android/dialer/interactions/PhoneNumberInteractionTest.java b/tests/src/com/android/dialer/interactions/PhoneNumberInteractionTest.java index 8d4b01f67..6671022ba 100644 --- a/tests/src/com/android/dialer/interactions/PhoneNumberInteractionTest.java +++ b/tests/src/com/android/dialer/interactions/PhoneNumberInteractionTest.java @@ -35,6 +35,7 @@ import com.android.contacts.common.test.mocks.MockContentProvider; import com.android.contacts.common.test.mocks.MockContentProvider.Query; import com.android.contacts.common.util.ContactDisplayUtils; import com.android.dialer.interactions.PhoneNumberInteraction.PhoneItem; +import com.android.dialer.util.TestConstants; import java.util.ArrayList; import java.util.List; @@ -179,7 +180,7 @@ public class PhoneNumberInteractionTest extends InstrumentationTestCase { Intent intent = mContext.getIntentForStartActivity(); assertNotNull(intent); - assertEquals(Intent.ACTION_CALL_PRIVILEGED, intent.getAction()); + assertEquals(TestConstants.CALL_INTENT_ACTION, intent.getAction()); assertEquals("tel:123", intent.getDataString()); } @@ -197,7 +198,7 @@ public class PhoneNumberInteractionTest extends InstrumentationTestCase { Intent intent = mContext.getIntentForStartActivity(); assertNotNull(intent); - assertEquals(Intent.ACTION_CALL_PRIVILEGED, intent.getAction()); + assertEquals(TestConstants.CALL_INTENT_ACTION, intent.getAction()); assertEquals("sip:example%40example.com", intent.getDataString()); } diff --git a/tests/src/com/android/dialer/util/TestConstants.java b/tests/src/com/android/dialer/util/TestConstants.java new file mode 100644 index 000000000..780626a27 --- /dev/null +++ b/tests/src/com/android/dialer/util/TestConstants.java @@ -0,0 +1,7 @@ +package com.android.dialer.util; + +import android.content.Intent; + +public class TestConstants { + public static final String CALL_INTENT_ACTION = Intent.ACTION_CALL; +} |