Merge "[Telephony Mainline] Add new api for Mvno matching" (70c19b40) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -10020,6 +10020,7 @@ package android.telephony {
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isAnyRadioPoweredOn();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isApnMetered(int);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isApplicationOnUicc(int);
		method public boolean isCurrentSimOperator(@NonNull String, int, @Nullable String);
		method public boolean isDataConnectivityPossible();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataEnabledForApn(int);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isEmergencyAssistanceEnabled();

+32 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@ import android.telephony.Annotation.NetworkType;
		import android.telephony.Annotation.RadioPowerState;
		import android.telephony.Annotation.SimActivationState;
		import android.telephony.VisualVoicemailService.VisualVoicemailTask;
		import android.telephony.data.ApnSetting.MvnoType;
		import android.telephony.emergency.EmergencyNumber;
		import android.telephony.emergency.EmergencyNumber.EmergencyServiceCategories;
		import android.telephony.ims.ImsMmTelManager;
		@@ -11917,6 +11918,37 @@ public class TelephonyManager {
		return true;
		}

		/**
		* Verifies whether the input MCC/MNC and MVNO correspond to the current carrier.
		*
		* @param mccmnc the carrier's mccmnc that you want to match
		* @param mvnoType the mvnoType that defined in {@link ApnSetting}
		* @param mvnoMatchData the MVNO match data
		* @return {@code true} if input mccmnc and mvno matches with data from sim operator.
		* {@code false} otherwise.
		*
		* {@hide}
		*/
		@SystemApi
		public boolean isCurrentSimOperator(@NonNull String mccmnc, @MvnoType int mvnoType,
		@Nullable String mvnoMatchData) {
		try {
		if (!mccmnc.equals(getSimOperator())) {
		Log.d(TAG, "The mccmnc does not match");
		return false;
		}
		ITelephony service = getITelephony();
		if (service != null) {
		return service.isMvnoMatched(getSubId(), mvnoType, mvnoMatchData);
		}
		} catch (RemoteException ex) {
		if (!isSystemProcess()) {
		ex.rethrowAsRuntimeException();
		}
		}
		return false;
		}

		/**
		* Set allowing mobile data during voice call.
		*

+2 −0

Original line number	Diff line number	Diff line
		@@ -2124,6 +2124,8 @@ interface ITelephony {

		boolean isApnMetered(int apnType, int subId);

		boolean isMvnoMatched(int subId, int mvnoType, String mvnoMatchData);

		/**
		* Enqueue a pending sms Consumer, which will answer with the user specified selection for an
		* outgoing SmsManager operation.