commit 151274cffffb518748a291504dd26fc8d816bd50
author Jake Hamby <jhamby@google.com> Thu Apr 11 18:13:54 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 11 18:13:54 2013 +0000
tree cdd2382c790130d15620bbe8034c63fd7095e51e
parent 3c6bdec23af42aba1168303cdefc20525b0ec1d0
parent 7667e7abe11b94b5573b565e25adbffdf7d65141

Merge "Fix some frameworks-telephony test compile errors." into jb-mr2-dev

src/java/com/android/internal/telephony/PhoneBase.java

diff --git a/src/java/com/android/internal/telephony/PhoneBase.java b/src/java/com/android/internal/telephony/PhoneBase.java
index 2cab9e5..4208326 100644
--- a/src/java/com/android/internal/telephony/PhoneBase.java
+++ b/src/java/com/android/internal/telephony/PhoneBase.java
@@ -774,7 +774,7 @@
     @Override
     public String getIccSerialNumber() {
         IccRecords r = mIccRecords.get();
-        return (r != null) ? r.getIccId() : "";
+        return (r != null) ? r.getIccId() : null;
     }
 
     @Override

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

diff --git a/src/java/com/android/internal/telephony/gsm/GSMPhone.java b/src/java/com/android/internal/telephony/gsm/GSMPhone.java
index b7b1901..9a4021b 100644
--- a/src/java/com/android/internal/telephony/gsm/GSMPhone.java
+++ b/src/java/com/android/internal/telephony/gsm/GSMPhone.java
@@ -896,13 +896,13 @@
     @Override
     public String getMsisdn() {
         IccRecords r = mIccRecords.get();
-        return (r != null) ? r.getMsisdnNumber() : "";
+        return (r != null) ? r.getMsisdnNumber() : null;
     }
 
     @Override
     public String getLine1AlphaTag() {
         IccRecords r = mIccRecords.get();
-        return (r != null) ? r.getMsisdnAlphaTag() : "";
+        return (r != null) ? r.getMsisdnAlphaTag() : null;
     }
 
     @Override