Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d75aee5 authored by Jack Yu's avatar Jack Yu
Browse files

Throw illegal argument exception when slot index is invalid 

Test: Manual
Bug: 144097779
Change-Id: I5c5c4eb313fd42317a2b0feed0946b8e4003ad62
parent 83f6768e

telephony/java/android/telephony/TelephonyManager.java

+6 −0
Original line number Diff line number Diff line
@@ -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());