commit 5f1a1d1d7babe445800bdae2e65a84f59d53e14a
author The Android Automerger <android-build@google.com> Mon Nov 17 06:12:48 2014 -0800
committer The Android Automerger <android-build@google.com> Mon Nov 17 06:12:48 2014 -0800
tree eec2fb53c614f6b9ecb4df06f66362c9d40b50e3
parent 26e8a3e31a8caf5daf303ce2f31e72a11236444f
parent 90e42e4135545549a514e7da7371216745c51046

merge in lmp-mr1-release history after reset to lmp-mr1-dev

tests/src/com/android/dialer/interactions/PhoneNumberInteractionTest.java

diff --git a/tests/src/com/android/dialer/interactions/PhoneNumberInteractionTest.java b/tests/src/com/android/dialer/interactions/PhoneNumberInteractionTest.java
index 6671022..8d5b53e 100644
--- a/tests/src/com/android/dialer/interactions/PhoneNumberInteractionTest.java
+++ b/tests/src/com/android/dialer/interactions/PhoneNumberInteractionTest.java
@@ -21,7 +21,6 @@
 import android.content.DialogInterface.OnDismissListener;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.CommonDataKinds.SipAddress;
 import android.provider.ContactsContract.Contacts;
@@ -48,12 +47,6 @@
  */
 @SmallTest
 public class PhoneNumberInteractionTest extends InstrumentationTestCase {
-
-    static {
-        // AsyncTask class needs to be initialized on the main thread.
-        AsyncTask.init();
-    }
-
     private final static class TestPhoneNumberInteraction extends PhoneNumberInteraction {
         private ArrayList<PhoneItem> mPhoneList;