1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/incallui/StatusBarNotifier.java b/src/com/android/incallui/StatusBarNotifier.java
index 3b5ad7e1..05ec1e7f 100644
--- a/src/com/android/incallui/StatusBarNotifier.java
+++ b/src/com/android/incallui/StatusBarNotifier.java
@@ -454,14 +454,15 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener,
         }
         if (TextUtils.isEmpty(contactInfo.name)) {
             String contactNumberDisplayed = TextUtils.isEmpty(contactInfo.number) ?
-                "" : contactInfo.number.toString();
+                    "" : contactInfo.number.toString();
             if (mContext.getResources().
-                getBoolean(R.bool.display_home_location_on_statusbar)) {
-                    contactNumberDisplayed =  contactNumberDisplayed + " " + contactInfo.location;
+                    getBoolean(R.bool.display_home_location_on_statusbar) &&
+                    !TextUtils.isEmpty(contactInfo.location)) {
+                contactNumberDisplayed =  contactNumberDisplayed + " " + contactInfo.location;
             }
             return TextUtils.isEmpty(contactNumberDisplayed) ? null
                     : BidiFormatter.getInstance().unicodeWrap(
-                            contactNumberDisplayed, TextDirectionHeuristics.LTR);
+                    contactNumberDisplayed, TextDirectionHeuristics.LTR);
         }
 
         return contactInfo.name;