diff options
| author | Santos Cordon <santoscordon@google.com> | 2013-09-04 14:31:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-04 14:31:36 -0700 |
| commit | d25d38bea79d8a6d77ad7ee56eeccc4746c068c2 (patch) | |
| tree | d1d22cfaa139168d44910efbda07f1923b42312c /InCallUI | |
| parent | 59c4ded19d57651039283122115f2bcc7e166ceb (diff) | |
| parent | c8fd833c85526f7c55e5b1d9bb951b3bf56bd621 (diff) | |
am 345ddcb4: Allows PhoneNumberService to be null for AOSP incallui.
* commit '345ddcb47f33a2a0cea517aed0809758ed1616c8':
Allows PhoneNumberService to be null for AOSP incallui.
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index 42dfb8e5e..db5b66a9a 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -69,8 +69,6 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> public void init(Context context, PhoneNumberService phoneNumberService, Call call) { mContext = Preconditions.checkNotNull(context); - mPhoneNumberService = Preconditions.checkNotNull(phoneNumberService); - mContext = context; mPhoneNumberService = phoneNumberService; // Call may be null if disconnect happened already. @@ -448,7 +446,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> } private void fetchImage(final String url) { - if (url != null) { + if (url != null && mPhoneNumberService != null) { mPhoneNumberService.fetchImage(url, new PhoneNumberService.ImageLookupListener() { @Override public void onImageFetchComplete(Bitmap bitmap) { |