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

Commit 7803cfa1 authored by Jayachandran C's avatar Jayachandran C Committed by Jayachandran Chinnakkannu
Browse files

Use new TelephonyManager API to get CdmaEriInformation 

Bug: 147839123
Test: Basic telephony testing
      atest frameworks/base/packages/SystemUI/tests

Change-Id: I6a3f5772acaa2c777eb2d35588f99d12254c6649
parent fd087975

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

+5 −5
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.os.Looper; 
import android.os.Message;

import android.provider.Settings.Global;

import android.telephony.Annotation;

import android.telephony.CdmaEriInformation;

import android.telephony.CellSignalStrength;

import android.telephony.CellSignalStrengthCdma;

import android.telephony.NetworkRegistrationInfo;
@@ -41,7 +42,6 @@ import android.util.Log; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.cdma.EriInfo;

import com.android.settingslib.Utils;

import com.android.settingslib.graph.SignalDrawable;

import com.android.settingslib.net.SignalStrengthUtil;
@@ -415,10 +415,10 @@ public class MobileSignalController extends SignalController< 
            return false;

        }

        if (isCdma() && mServiceState != null) {

            final int iconMode = mServiceState.getCdmaEriIconMode();

            return mServiceState.getCdmaEriIconIndex() != EriInfo.ROAMING_INDICATOR_OFF

                    && (iconMode == EriInfo.ROAMING_ICON_MODE_NORMAL

                    || iconMode == EriInfo.ROAMING_ICON_MODE_FLASH);

            final int iconMode = mPhone.getCdmaEriInformation().getEriIconMode();

            return mPhone.getCdmaEriInformation().getEriIconIndex() != CdmaEriInformation.ERI_OFF

                    && (iconMode == CdmaEriInformation.ERI_ICON_MODE_NORMAL

                    || iconMode == CdmaEriInformation.ERI_ICON_MODE_FLASH);

        } else {

            return mServiceState != null && mServiceState.getRoaming();

        }

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

+10 −5
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.net.wifi.WifiManager; 
import android.os.Handler;

import android.provider.Settings;

import android.provider.Settings.Global;

import android.telephony.CdmaEriInformation;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.PhoneStateListener;

import android.telephony.ServiceState;
@@ -111,6 +112,8 @@ public class NetworkControllerBaseTest extends SysuiTestCase { 
    private NetworkCapabilities mNetCapabilities;

    private ConnectivityManager.NetworkCallback mNetworkCallback;



    private CdmaEriInformation mEriInformation;



    @Rule

    public TestWatcher failWatcher = new TestWatcher() {

        @Override
@@ -155,6 +158,10 @@ public class NetworkControllerBaseTest extends SysuiTestCase { 
        mSignalStrength = mock(SignalStrength.class);

        mServiceState = mock(ServiceState.class);



        mEriInformation = new CdmaEriInformation(CdmaEriInformation.ERI_OFF,

                CdmaEriInformation.ERI_ICON_MODE_NORMAL);

        when(mMockTm.getCdmaEriInformation()).thenReturn(mEriInformation);



        mConfig = new Config();

        mConfig.hspaDataDistinguishable = true;

        mCallbackHandler = mock(CallbackHandler.class);
@@ -305,11 +312,9 @@ public class NetworkControllerBaseTest extends SysuiTestCase { 
    }



    public void setCdmaRoaming(boolean isRoaming) {

        when(mServiceState.getCdmaEriIconIndex()).thenReturn(isRoaming ?

                EriInfo.ROAMING_INDICATOR_ON : EriInfo.ROAMING_INDICATOR_OFF);

        when(mServiceState.getCdmaEriIconMode()).thenReturn(isRoaming ?

                EriInfo.ROAMING_ICON_MODE_NORMAL : -1);

        updateServiceState();

        mEriInformation.setEriIconIndex(isRoaming ?

                CdmaEriInformation.ERI_ON : CdmaEriInformation.ERI_OFF);

        when(mMockTm.getCdmaEriInformation()).thenReturn(mEriInformation);

    }



    public void setVoiceRegState(int voiceRegState) {