From 0d75aee571eb6a7048a618af894c41a24e8e5cbd Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Fri, 8 Nov 2019 09:56:02 -0800
Subject: [PATCH] Throw illegal argument exception when slot index is invalid

Test: Manual
Bug: 144097779
Change-Id: I5c5c4eb313fd42317a2b0feed0946b8e4003ad62
---
 telephony/java/android/telephony/TelephonyManager.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 5a63eb08860ba..05355db60d09a 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -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());