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

Commit bbe735d2 authored Oct 30, 2020 by Sarah Chin Committed by Android (Google) Code Review Oct 30, 2020

Merge "Replace IconIndex as DisplayNumber"

parents 508ac4b8 73157571

api/system-current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -11772,7 +11772,7 @@ package android.telephony {
	method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getCarrierPrivilegeStatus(int);		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getCarrierPrivilegeStatus(int);
	method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<java.lang.String> getCarrierPrivilegedPackagesForAllActiveSubscriptions();		method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<java.lang.String> getCarrierPrivilegedPackagesForAllActiveSubscriptions();
	method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.CarrierRestrictionRules getCarrierRestrictionRules();		method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.CarrierRestrictionRules getCarrierRestrictionRules();
	method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getCdmaEnhancedRoamingIndicatorIconIndex();		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getCdmaEnhancedRoamingIndicatorDisplayNumber();
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMdn();		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMdn();
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMdn(int);		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMdn(int);
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMin();		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMin();

non-updatable-api/system-current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10620,7 +10620,7 @@ package android.telephony {
	method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getCarrierPrivilegeStatus(int);		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getCarrierPrivilegeStatus(int);
	method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<java.lang.String> getCarrierPrivilegedPackagesForAllActiveSubscriptions();		method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<java.lang.String> getCarrierPrivilegedPackagesForAllActiveSubscriptions();
	method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.CarrierRestrictionRules getCarrierRestrictionRules();		method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.CarrierRestrictionRules getCarrierRestrictionRules();
	method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getCdmaEnhancedRoamingIndicatorIconIndex();		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getCdmaEnhancedRoamingIndicatorDisplayNumber();
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMdn();		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMdn();
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMdn(int);		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMdn(int);
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMin();		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMin();

packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -427,7 +427,8 @@ public class MobileSignalController extends SignalController<
	return false;		return false;
	}		}
	if (isCdma()) {		if (isCdma()) {
	return mPhone.getCdmaEnhancedRoamingIndicatorIconIndex() != TelephonyManager.ERI_OFF;		return mPhone.getCdmaEnhancedRoamingIndicatorDisplayNumber()
			!= TelephonyManager.ERI_OFF;
	} else {		} else {
	return mServiceState != null && mServiceState.getRoaming();		return mServiceState != null && mServiceState.getRoaming();
	}		}

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -314,7 +314,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
	}		}

	public void setCdmaRoaming(boolean isRoaming) {		public void setCdmaRoaming(boolean isRoaming) {
	when(mMockTm.getCdmaEnhancedRoamingIndicatorIconIndex()).thenReturn(		when(mMockTm.getCdmaEnhancedRoamingIndicatorDisplayNumber()).thenReturn(
	isRoaming ? TelephonyManager.ERI_ON : TelephonyManager.ERI_OFF);		isRoaming ? TelephonyManager.ERI_ON : TelephonyManager.ERI_OFF);
	}		}

telephony/java/android/telephony/TelephonyManager.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -5703,14 +5703,14 @@ public class TelephonyManager {
	public static final int ERI_ICON_MODE_FLASH = 1;		public static final int ERI_ICON_MODE_FLASH = 1;

	/**		/**
	* Returns the CDMA ERI icon index to display. The number is assigned by		* Returns the CDMA ERI icon display number. The number is assigned by
	* 3GPP2 C.R1001-H v1.0 Table 8.1-1. Additionally carriers define their own ERI icon index.		* 3GPP2 C.R1001-H v1.0 Table 8.1-1. Additionally carriers define their own ERI display numbers.
	* Defined values are {@link #ERI_ON}, {@link #ERI_OFF}, and {@link #ERI_FLASH}.		* Defined values are {@link #ERI_ON}, {@link #ERI_OFF}, and {@link #ERI_FLASH}.
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)		@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
	public @EriIconIndex int getCdmaEnhancedRoamingIndicatorIconIndex() {		public @EriIconIndex int getCdmaEnhancedRoamingIndicatorDisplayNumber() {
	return getCdmaEriIconIndex(getSubId());		return getCdmaEriIconIndex(getSubId());
	}		}