diff options
| -rw-r--r-- | proguard.flags | 2 | ||||
| -rw-r--r-- | tests/src/com/android/contacts/common/preference/ContactsPreferencesTest.java | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/proguard.flags b/proguard.flags index 863d27a0b..b7b9f1827 100644 --- a/proguard.flags +++ b/proguard.flags @@ -15,6 +15,7 @@ # Needed for tests -keep class com.android.contacts.common.compat.CompatUtils { *; } -keep class com.android.contacts.common.Collapser { *; } +-keep class com.android.contacts.common.ContactPhotoManager { *; } -keep class com.android.contacts.common.ContactsUtils { *; } -keep class com.android.contacts.common.database.NoNullCursorAsyncQueryHandler { *; } -keep class com.android.contacts.common.format.FormatUtils { *; } @@ -64,6 +65,7 @@ -keep class com.android.contacts.common.model.ValuesDelta { *; } -keep class com.android.contacts.common.MoreContactUtils { *; } -keep class com.android.contacts.common.preference.ContactsPreferences { *; } +-keep class com.android.contacts.common.test.mocks.MockContactPhotoManager { *; } -keep class com.android.contacts.common.testing.InjectedServices { *; } -keep class com.android.contacts.common.util.BitmapUtil { *; } -keep class com.android.contacts.common.util.ContactDisplayUtils { *; } 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() { |