commit 37f142891fa0e3edd6bdefa3f25628e4c1aa900f
author Yorke Lee <yorkelee@google.com> Tue Mar 11 23:22:33 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 11 23:22:33 2014 +0000
tree 320bd80ccfc69d707f7fec21b72c1233c475a32b
parent bd8a362a5bc1fdb224181cce20daa026e71e2667
parent 6567a894fb1a852c5dbfa1ad2848207494a7eae0

am 6567a894: DO NOT MERGE Add null check in ContactInfoHelper.isBusiness

* commit '6567a894fb1a852c5dbfa1ad2848207494a7eae0':
  DO NOT MERGE Add null check in ContactInfoHelper.isBusiness

src/com/android/dialer/calllog/ContactInfoHelper.java

diff --git a/src/com/android/dialer/calllog/ContactInfoHelper.java b/src/com/android/dialer/calllog/ContactInfoHelper.java
index 28edcf3..e1a01b4 100644
--- a/src/com/android/dialer/calllog/ContactInfoHelper.java
+++ b/src/com/android/dialer/calllog/ContactInfoHelper.java
@@ -282,6 +282,7 @@
      *        {@link #mCachedNumberLookupService}.
      */
     public boolean isBusiness(int sourceType) {
-        return mCachedNumberLookupService.isBusiness(sourceType);
+        return mCachedNumberLookupService != null
+                && mCachedNumberLookupService.isBusiness(sourceType);
     }
 }