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

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

Replace IconIndex as DisplayNumber 

Test: atest TelephonyManagerTest
Fix: 171770692
Change-Id: I256649ad0ddcada29e4a7012de3e5889348adb17
parent e5afeb20

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -11762,7 +11762,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();

non-updatable-api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -10613,7 +10613,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();

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

+2 −1
Original line number Diff line number Diff line
@@ -427,7 +427,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();

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,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);

    }

telephony/java/android/telephony/TelephonyManager.java

+3 −3
Original line number Diff line number Diff line
@@ -5703,14 +5703,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());















    }