summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorArthur Wang <wuwang@google.com>2016-09-22 00:30:12 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-22 00:30:12 +0000
commit510f465c6db4517ce4f463886f9bfa0e7008d534 (patch)
tree2cc0fdcac717eff43f8a419ca85a218f2d04c980 /tests
parent625e1061ee5014488d06013c158277b77d0f7c5f (diff)
parent9589ef63c950b6f25a260fc9e0909de3ac811286 (diff)
downloadpackages_apps_Contacts-510f465c6db4517ce4f463886f9bfa0e7008d534.tar.gz
packages_apps_Contacts-510f465c6db4517ce4f463886f9bfa0e7008d534.tar.bz2
packages_apps_Contacts-510f465c6db4517ce4f463886f9bfa0e7008d534.zip
Convert handler creation on the main thread.
am: 9589ef63c9 Change-Id: Ia9b5dffaadcfa43bbc3ab74abc97a59ae8cfc400
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/contacts/common/preference/ContactsPreferencesTest.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/src/com/android/contacts/common/preference/ContactsPreferencesTest.java b/tests/src/com/android/contacts/common/preference/ContactsPreferencesTest.java
index 4b5c300c6..a84190250 100644
--- a/tests/src/com/android/contacts/common/preference/ContactsPreferencesTest.java
+++ b/tests/src/com/android/contacts/common/preference/ContactsPreferencesTest.java
@@ -19,6 +19,7 @@ package com.android.contacts.common.preference;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.res.Resources;
+import android.support.test.InstrumentationRegistry;
import android.test.InstrumentationTestCase;
import android.test.suitebuilder.annotation.SmallTest;
@@ -59,7 +60,12 @@ public class ContactsPreferencesTest extends InstrumentationTestCase {
Mockito.when(mSharedPreferences.contains(ContactsPreferences.DISPLAY_ORDER_KEY))
.thenReturn(true);
- mContactsPreferences = new ContactsPreferences(mContext);
+ InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {
+ @Override
+ public void run() {
+ mContactsPreferences = new ContactsPreferences(mContext);
+ }
+ });
}
public void testGetSortOrderDefault() {