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

Commit 85339372 authored by Jack Yu's avatar Jack Yu
Browse files

Renamed NetworkRegistrationState to NetworkRegistrationInfo 

API review changes. The class covers more information other than
registration state.

Test: Build
Bug: 127657991
Change-Id: I362bcd3e4bec91817081ddea2f822062b12c4207
parent a63fd33c

src/com/android/settings/network/telephony/NetworkSelectSettings.java

+4 −4
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.telephony.AccessNetworkConstants; 
import android.telephony.CarrierConfigManager;

import android.telephony.CellIdentity;

import android.telephony.CellInfo;

import android.telephony.NetworkRegistrationState;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.ServiceState;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;
@@ -304,7 +304,7 @@ public class NetworkSelectSettings extends DashboardFragment { 
     * Config the connected network operator preference when the page was created. When user get

     * into this page, the device might or might not have data connection.

     * - If the device has data:

     * 1. use {@code ServiceState#getNetworkRegistrationStates()} to get the currently

     * 1. use {@code ServiceState#getNetworkRegistrationInfoList()} to get the currently

     * registered cellIdentity, wrap it into a CellInfo;

     * 2. set the signal strength level as strong;

     * 3. use {@link TelephonyManager#getNetworkOperatorName()} to get the title of the
@@ -317,8 +317,8 @@ public class NetworkSelectSettings extends DashboardFragment { 
        if (mTelephonyManager.getDataState() == mTelephonyManager.DATA_CONNECTED) {

            // Try to get the network registration states

            ServiceState ss = mTelephonyManager.getServiceState();

            List<NetworkRegistrationState> networkList =

                    ss.getNetworkRegistrationStatesForTransportType(

            List<NetworkRegistrationInfo> networkList =

                    ss.getNetworkRegistrationInfoListForTransportType(

                            AccessNetworkConstants.TRANSPORT_TYPE_WWAN);

            if (networkList == null || networkList.size() == 0) {

                // Remove the connected network operators category