commit fa1c259f52d6ab6b3b0e547214815e1d95f0b55e
author shilu <shilu@google.com> Tue Mar 10 10:59:43 2020 -0700
committer Shi Lu <shilu@google.com> Wed Mar 11 20:03:55 2020 +0000
tree 2e9411370e4895c7b9a2285da941f1d562e1a902
parent 1ea3d12fa903601bbfb828cce5f84fe5137db976

After API Review: getManualNetworkSelectionPlmn

This method should return null instead of an empty

Bug: 148981244
Test: Manual
Change-Id: Ibfaada22286c7277bb5fd0f127ce9b486b8d23eb

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 434d952..0c01891 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -5247,12 +5247,12 @@
         final long identity = Binder.clearCallingIdentity();
         try {
             if (!isActiveSubscription(subId)) {
-                return "";
+                throw new IllegalArgumentException("Invalid Subscription Id: " + subId);
             }
 
             final Phone phone = getPhone(subId);
             if (phone == null) {
-                return "";
+                throw new IllegalArgumentException("Invalid Subscription Id: " + subId);
             }
             OperatorInfo networkSelection = phone.getSavedNetworkSelection();
             return TextUtils.isEmpty(networkSelection.getOperatorNumeric())