commit 6599bec1137908b8c1202cf8cf6c7866479511b9
author Yorke Lee <yorkelee@google.com> Thu Mar 13 23:47:39 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 13 23:47:39 2014 +0000
tree c82f545292814a4fd55363297d9f71a2f2ef3768
parent 7de0b82a6326024cb44fb4c54a6f990c6fee4654
parent 9215d9bf6bc854e59357d5e85e7dfcd7b2fabb07

am 9215d9bf: am e6a52dbe: am 37f14289: am 6567a894: DO NOT MERGE Add null check in ContactInfoHelper.isBusiness

* commit '9215d9bf6bc854e59357d5e85e7dfcd7b2fabb07':
  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);
     }
 }