Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5aa95e47 authored Nov 02, 2020 by Sarah Chin

Add TestApi for getSupportedRadioAccessFamily

Test: atest TelephonyManagerTest
Fix: 172060765
Change-Id: I7d1e2973bc42f04ab0d28752bce9ed8fa93fdba9
Merged-In: I7d1e2973bc42f04ab0d28752bce9ed8fa93fdba9

parent ea337540

core/api/test-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1673,6 +1673,7 @@ package android.telephony {
	method @NonNull public java.util.List<android.telephony.data.ApnSetting> getDevicePolicyOverrideApns(@NonNull android.content.Context);		method @NonNull public java.util.List<android.telephony.data.ApnSetting> getDevicePolicyOverrideApns(@NonNull android.content.Context);
	method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getLine1AlphaTag();		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getLine1AlphaTag();
	method public android.util.Pair<java.lang.Integer,java.lang.Integer> getRadioHalVersion();		method public android.util.Pair<java.lang.Integer,java.lang.Integer> getRadioHalVersion();
			method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getSupportedRadioAccessFamily();
	method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isMobileDataPolicyEnabled(int);		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isMobileDataPolicyEnabled(int);
	method public boolean modifyDevicePolicyOverrideApn(@NonNull android.content.Context, int, @NonNull android.telephony.data.ApnSetting);		method public boolean modifyDevicePolicyOverrideApn(@NonNull android.content.Context, int, @NonNull android.telephony.data.ApnSetting);
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile();		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile();

telephony/java/android/telephony/TelephonyManager.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -11795,12 +11795,13 @@ public class TelephonyManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
			@TestApi
	@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)		@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
	public @NetworkTypeBitMask long getSupportedRadioAccessFamily() {		public @NetworkTypeBitMask long getSupportedRadioAccessFamily() {
	try {		try {
	ITelephony telephony = getITelephony();		ITelephony telephony = getITelephony();
	if (telephony != null) {		if (telephony != null) {
	return (long) telephony.getRadioAccessFamily(getSlotIndex(), getOpPackageName());		return telephony.getRadioAccessFamily(getSlotIndex(), getOpPackageName());
	} else {		} else {
	// This can happen when the ITelephony interface is not up yet.		// This can happen when the ITelephony interface is not up yet.
	return NETWORK_TYPE_BITMASK_UNKNOWN;		return NETWORK_TYPE_BITMASK_UNKNOWN;