commit 59dc8d1db4c557ace1ded52122993be2e73f6863
author Sanket Padawe <sanketpadawe@google.com> Wed Oct 22 11:36:08 2014 -0700
committer Sanket Padawe <sanketpadawe@google.com> Wed Oct 22 11:36:08 2014 -0700
tree 9624c47b05e72b1ad99c66f6084b2f0e18636bb7
parent a1640daf6202b12e64bcc26647449695f9ef2a61

SIM settings display name changes

Resubmitting the change for displaying SIM name in SIM settings.

Change-Id: I22d368c3880eaa54d37c9afcfd63d4e94e41fea8

src/com/android/settings/sim/SimSettings.java

diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index 3aa79b9..cd556b6 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -428,12 +428,12 @@
         public void update() {
             final Resources res = getResources();
 
-            if(mSubInfoRecord.displayName.length() == 0) {
-                setTitle(getCarrierName());
-            } else {
-                setTitle(mSubInfoRecord.displayName);
-            }
             if (mSubInfoRecord != null) {
+                if(TextUtils.isEmpty(mSubInfoRecord.displayName)) {
+                    setTitle(getCarrierName());
+                } else {
+                    setTitle(mSubInfoRecord.displayName);
+                }
                 setSummary(mSubInfoRecord.number.toString());
                 setEnabled(true);
             } else {