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

@@ -428,12 +428,12 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
         public void update() {
             final Resources res = getResources();
 
-            if(mSubInfoRecord.displayName.length() == 0) {
+            if (mSubInfoRecord != null) {
+                if(TextUtils.isEmpty(mSubInfoRecord.displayName)) {
                     setTitle(getCarrierName());
                 } else {
                     setTitle(mSubInfoRecord.displayName);
                 }
-            if (mSubInfoRecord != null) {
                 setSummary(mSubInfoRecord.number.toString());
                 setEnabled(true);
             } else {