Commit 122427dd authored Jun 03, 2025 by rambowang Committed by Rambo Wang Jun 03, 2025

Enforce permission check of API TM.isMultiSimSupported for all devices

The change fixes the bug that permission check is bypassed for single
SIM devices when calling TelephonyManager.isMultiSimSupported.

This change makes sure that SecurityExceptioin will be thrown if caller
has no permission.

The change doesn't change the behavior if caller has permission.

Bug: 401006757
Test: atest CtsTelephony2TestCases CtsTelephonyTestCases
Flag: com.android.internal.telephony.flags.macro_based_opportunistic_networks
Change-Id: Ida3465d3ab7dc790e1853fbcd71db9fc54cad8b5

parent a2490d2a

telephony/java/android/telephony/TelephonyManager.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -16221,9 +16221,6 @@ public class TelephonyManager {
		@RequiresFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)
		@IsMultiSimSupportedResult
		public int isMultiSimSupported() {
		if (getSupportedModemCount() < 2) {
		return TelephonyManager.MULTISIM_NOT_SUPPORTED_BY_HARDWARE;
		}
		try {
		ITelephony service = getITelephony();
		if (service != null) {