Throw illegal argument exception when slot index is invalid

Test: Manual
Bug: 144097779
Change-Id: I5c5c4eb313fd42317a2b0feed0946b8e4003ad62
This commit is contained in:
Jack Yu
2019-11-08 09:56:02 -08:00
parent 83f6768e9b
commit 0d75aee571

View File

@@ -2584,6 +2584,8 @@ public class TelephonyManager {
*
* @return the lowercase 2 character ISO-3166 country code, or empty string if not available.
*
* @throws IllegalArgumentException when the slotIndex is invalid.
*
* {@hide}
*/
@SystemApi
@@ -2592,6 +2594,10 @@ public class TelephonyManager {
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public String getNetworkCountryIso(int slotIndex) {
try {
if (!SubscriptionManager.isValidSlotIndex(slotIndex)) {
throw new IllegalArgumentException("invalid slot index " + slotIndex);
}
ITelephony telephony = getITelephony();
if (telephony == null) return "";
return telephony.getNetworkCountryIsoForPhone(slotIndex, getOpPackageName());