From c8fd833c85526f7c55e5b1d9bb951b3bf56bd621 Mon Sep 17 00:00:00 2001
From: Santos Cordon <santoscordon@google.com>
Date: Wed, 4 Sep 2013 13:41:22 -0700
Subject: Allows PhoneNumberService to be null for AOSP incallui.

bug:10573211
Change-Id: I57ea456b286845fd1c9cf65833c32d4bfb227fc3
---
 InCallUI/src/com/android/incallui/CallCardPresenter.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'InCallUI')

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) {
-- 
cgit v1.2.3