Commit d17f6214 authored Oct 23, 2025 by Jayachandran C Committed by Android Build Coastguard Worker Jan 07, 2026

Block overriding satellite carrier config keys on user builds

Add a blocklist to CarrierConfigLoader.overrideConfig to prevent certain sensitive carrier config keys from being overridden on user builds.

The following keys are now blocklisted:

KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL
KEY_SATELLITE_DATA_SUPPORT_MODE_INT

Attempting to override these keys on a user build will result in a SecurityException. This restriction does not affect userdebug or eng builds, where overriding these values for testing purposes is still allowed.

Test: Added CarrierConfigLoaderTest#testOverrideConfig_blockedKeys to verify the new logic.
Flag: EXEMPT BUGFIX
Bug: 442272360
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:9127724a48d3cf4386c2ea1f4369f4042b484bbe
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:17bf842b30f927d9820ecb9970408bcdb0c71b75
Merged-In: I8bc6f72854ce664b70b852f49c4136cbba31d5e5
Change-Id: I8bc6f72854ce664b70b852f49c4136cbba31d5e5

parent 924df83d

telephony/java/android/telephony/TelephonyManager.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -18485,6 +18485,23 @@ public class TelephonyManager {
		}
		}

		/**
		* Get the modem service name.
		* @return the service name of the modem service which bind to.
		* @hide
		*/
		public String getModemService() {
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null) {
		return telephony.getModemService();
		}
		} catch (RemoteException ex) {
		Rlog.e(TAG, "getModemService RemoteException", ex);
		}
		return null;
		}

		/**
		* The unattended reboot was prepared successfully.
		* @hide