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

Commit c6481cce authored by Sarah Chin's avatar Sarah Chin
Browse files

Replace IconIndex as DisplayNumber

Test: atest TelephonyManagerTest
Fix: 171770692
Change-Id: I256649ad0ddcada29e4a7012de3e5889348adb17
Merged-In: I256649ad0ddcada29e4a7012de3e5889348adb17
parent 1b48e894
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -10108,7 +10108,7 @@ package android.telephony {
    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 @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(int);
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMin();
+2 −1
Original line number Diff line number Diff line
@@ -423,7 +423,8 @@ public class MobileSignalController extends SignalController<
            return false;
        }
        if (isCdma()) {
            return mPhone.getCdmaEnhancedRoamingIndicatorIconIndex() != TelephonyManager.ERI_OFF;
            return mPhone.getCdmaEnhancedRoamingIndicatorDisplayNumber()
                    != TelephonyManager.ERI_OFF;
        } else {
            return mServiceState != null && mServiceState.getRoaming();
        }
+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
    }

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

+3 −3
Original line number Diff line number Diff line
@@ -5657,14 +5657,14 @@ public class TelephonyManager {
    public static final int ERI_ICON_MODE_FLASH = 1;
    /**
     * Returns the CDMA ERI icon index to display. The number is assigned by
     * 3GPP2 C.R1001-H v1.0 Table 8.1-1. Additionally carriers define their own ERI icon index.
     * 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 display numbers.
     * Defined values are {@link #ERI_ON}, {@link #ERI_OFF}, and {@link #ERI_FLASH}.
     * @hide
     */
    @SystemApi
    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
    public @EriIconIndex int getCdmaEnhancedRoamingIndicatorIconIndex() {
    public @EriIconIndex int getCdmaEnhancedRoamingIndicatorDisplayNumber() {
        return getCdmaEriIconIndex(getSubId());
    }