diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-08-14 17:59:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-14 17:59:34 +0000 |
| commit | e4e6af062ac73a3efda7c997900ec350a932ba64 (patch) | |
| tree | 7f98300ff2318f2eefb50d84ca2701a416590fb4 /java/com/android/contacts/common | |
| parent | f47440d2cf7004098d3ef88849d45620e4945d09 (diff) | |
| parent | 9a6afa3ae2bfc0074f7f64a7ec3238c26e913c3c (diff) | |
Update oc-dr1-dev to v11.1 RC06
am: 9a6afa3ae2
Change-Id: I6b91752ffad91f4c06e2c0d0ec40ac3048184333
Diffstat (limited to 'java/com/android/contacts/common')
| -rw-r--r-- | java/com/android/contacts/common/list/PhoneNumberListAdapter.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/java/com/android/contacts/common/list/PhoneNumberListAdapter.java b/java/com/android/contacts/common/list/PhoneNumberListAdapter.java index d1118c3c7..ae15eb232 100644 --- a/java/com/android/contacts/common/list/PhoneNumberListAdapter.java +++ b/java/com/android/contacts/common/list/PhoneNumberListAdapter.java @@ -27,6 +27,7 @@ import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.CommonDataKinds.SipAddress; import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Directory; +import android.support.annotation.VisibleForTesting; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; @@ -357,7 +358,8 @@ public class PhoneNumberListAdapter extends ContactEntryListAdapter { bindPhoneNumber(view, cursor, directory.isDisplayNumber(), position); } - protected void bindPhoneNumber( + @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED) + public void bindPhoneNumber( ContactListItemView view, Cursor cursor, boolean displayNumber, int position) { CharSequence label = null; if (displayNumber && !cursor.isNull(PhoneQuery.PHONE_TYPE)) { @@ -397,7 +399,8 @@ public class PhoneNumberListAdapter extends ContactEntryListAdapter { } } - if (LightbringerComponent.get(mContext).getLightbringer().isReachable(mContext, number)) { + if (action == ContactListItemView.NONE + && LightbringerComponent.get(mContext).getLightbringer().isReachable(mContext, number)) { action = ContactListItemView.LIGHTBRINGER; } |