commit 77a4ce6c6896b15ca32f8d1958f184e0c1eedddc
author Hyejin Kim <hyejin.kim@lge.com> Thu Dec 10 18:27:01 2015 +0900
committer Vineeta Srivastava <vsrivastava@google.com> Tue Dec 29 11:27:01 2015 -0800
tree 0360a4cba69857666351f82d724ab37a43a92f34
parent 3230d5cdc501735528575348b74d0be26297a469

When Wi-Fi calling is available, be able to display only "Wi-Fi"

Some operator want to show "Wi-Fi Calling" only without SPN.

BUG=25498707
Change-Id: I7428fc586054c9c6956f9e6c04c58c5b1e6c856e

src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

diff --git a/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
index 7935416..1ff2d08 100755
--- a/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
@@ -634,15 +634,17 @@
                 && ((rule & SIMRecords.SPN_RULE_SHOW_SPN)
                         == SIMRecords.SPN_RULE_SHOW_SPN);
 
-        if (!TextUtils.isEmpty(spn)
-                && mPhone.getImsPhone() != null
+        if (mPhone.getImsPhone() != null
                 && ((ImsPhone) mPhone.getImsPhone()).isVowifiEnabled()) {
-            // In Wi-Fi Calling mode show SPN+WiFi
+            // In Wi-Fi Calling mode show SPN?+WiFi
             String formatVoice = mPhone.getContext().getText(
                     com.android.internal.R.string.wfcSpnFormat).toString();
             String formatData = mPhone.getContext().getText(
                     com.android.internal.R.string.wfcDataSpnFormat).toString();
-            String originalSpn = spn.trim();
+            String originalSpn = "";
+            if (!TextUtils.isEmpty(spn)) {
+                originalSpn = spn.trim();
+            }
             spn = String.format(formatVoice, originalSpn);
             dataSpn = String.format(formatData, originalSpn);
             showSpn = true;