Telephony: Return 'null' when SubscriberId and Line1Number are unavailable
Return 'null' instead of "" (empty string) when Subscriber Id and
Line1Number are unavailable. This confirms to the definition of the
public API.
Bug: 8284793
Change-Id: Ie6395623cf413d51f6e10316aded71e2eaf5592c
diff --git a/src/java/com/android/internal/telephony/gsm/GSMPhone.java b/src/java/com/android/internal/telephony/gsm/GSMPhone.java
index b930348..7c675d8 100644
--- a/src/java/com/android/internal/telephony/gsm/GSMPhone.java
+++ b/src/java/com/android/internal/telephony/gsm/GSMPhone.java
@@ -853,12 +853,12 @@
public String getSubscriberId() {
IccRecords r = mIccRecords.get();
- return (r != null) ? r.getIMSI() : "";
+ return (r != null) ? r.getIMSI() : null;
}
public String getLine1Number() {
IccRecords r = mIccRecords.get();
- return (r != null) ? r.getMsisdnNumber() : "";
+ return (r != null) ? r.getMsisdnNumber() : null;
}
@Override
