Merge change Idfc116fe into eclair

* changes:
  Return null if SIM doesn't have the MSISDN Aplha tag.
This commit is contained in:
Android (Google) Code Review
2009-11-12 16:10:10 -08:00

View File

@@ -879,16 +879,7 @@ public class GSMPhone extends PhoneBase {
} }
public String getLine1AlphaTag() { public String getLine1AlphaTag() {
String ret; return mSIMRecords.getMsisdnAlphaTag();
ret = mSIMRecords.getMsisdnAlphaTag();
if (ret == null || ret.length() == 0) {
return mContext.getText(
com.android.internal.R.string.defaultMsisdnAlphaTag).toString();
}
return ret;
} }
public void setLine1Number(String alphaTag, String number, Message onComplete) { public void setLine1Number(String alphaTag, String number, Message onComplete) {