Allow INVALID_SUB_ID to get Default Phone
When there is no active subscription, TMs that
are registered with the DEFAULT_SUB_ID end up
passing INVALID_SUB_ID in over the binder, and
there is no way to distinguish between DEFAULT
and INVALID subIds from the user. Since changing
that is a larger change and the distinction is
only meaningful for an error case, this change
allows INVALID subId to map to the default phone
which means that both INVALID and DEFAULT will
map to default phone in Q.
Bug: 132288588
Test: cts - atest CellInfoTest
Change-Id: Ice9a32e0ed91bd1f7d94653e6d570eaf62ae191d
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index bdf66df..9ccba80 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2139,7 +2139,8 @@
return;
}
- final Phone phone = getPhone(subId);
+
+ final Phone phone = getPhoneFromSubId(subId);
if (phone == null) throw new IllegalArgumentException("Invalid Subscription Id: " + subId);
sendRequestAsync(CMD_REQUEST_CELL_INFO_UPDATE, cb, phone, workSource);