diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-08-03 11:34:42 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-08-11 19:33:20 +0000 |
| commit | 9a6afa3ae2bfc0074f7f64a7ec3238c26e913c3c (patch) | |
| tree | 7f98300ff2318f2eefb50d84ca2701a416590fb4 /java/com/android/contacts/common | |
| parent | ff2ad7ffdba7c74077eae3016b32174f0f2dad30 (diff) | |
Update oc-dr1-dev to v11.1 RC06
This moves the branch forward from v11 RC17.
This release contains fixes for the following bugs:
Bug: 63584851 63803282 63917358 64099380
64101648 64105912 64119808 64122858
64125770 64300111
Test: TH, on device
Merged-In: I858e3665253139b8aab4e4c063bfc4c419f33cc9
Merged-In: Ifc146f2fec24fd2f8a51cd32feb3699bb1c07136
Change-Id: I48296c56fb1d275a06b7c314f5380266c1195ef2
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; } |