Merge "[DO NOT MERGE]Add check for slot index value" into pi-dev (dbf0f79d) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+13 −8

Original line number	Diff line number	Diff line
		@@ -7581,6 +7581,9 @@ public class TelephonyManager {
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		public int setAllowedCarriers(int slotIndex, List<CarrierIdentifier> carriers) {
		if (!SubscriptionManager.isValidPhoneId(slotIndex)) {
		return -1;
		}
		try {
		ITelephony service = getITelephony();
		if (service != null) {
		@@ -7608,6 +7611,7 @@ public class TelephonyManager {
		@SystemApi
		@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		public List<CarrierIdentifier> getAllowedCarriers(int slotIndex) {
		if (SubscriptionManager.isValidPhoneId(slotIndex)) {
		try {
		ITelephony service = getITelephony();
		if (service != null) {
		@@ -7618,6 +7622,7 @@ public class TelephonyManager {
		} catch (NullPointerException e) {
		Log.e(TAG, "Error calling ITelephony#getAllowedCarriers", e);
		}
		}
		return new ArrayList<CarrierIdentifier>(0);
		}