Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Throw illegal argument exception when slot index is invalid

Browse Source 
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
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telephony/java/android/telephony/TelephonyManager.java
View File

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