summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-03-13 23:47:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-13 23:47:39 +0000
commit6599bec1137908b8c1202cf8cf6c7866479511b9 (patch)
treec82f545292814a4fd55363297d9f71a2f2ef3768
parent7de0b82a6326024cb44fb4c54a6f990c6fee4654 (diff)
parent9215d9bf6bc854e59357d5e85e7dfcd7b2fabb07 (diff)
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
-rw-r--r--src/com/android/dialer/calllog/ContactInfoHelper.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/dialer/calllog/ContactInfoHelper.java b/src/com/android/dialer/calllog/ContactInfoHelper.java
index 28edcf3ec..e1a01b4ed 100644
--- a/src/com/android/dialer/calllog/ContactInfoHelper.java
+++ b/src/com/android/dialer/calllog/ContactInfoHelper.java
@@ -282,6 +282,7 @@ public class ContactInfoHelper {
* {@link #mCachedNumberLookupService}.
*/
public boolean isBusiness(int sourceType) {
- return mCachedNumberLookupService.isBusiness(sourceType);
+ return mCachedNumberLookupService != null
+ && mCachedNumberLookupService.isBusiness(sourceType);
}
}