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

Commit 8b8f2d0e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update references to moved CDMA_ROAMING_MODE_ constants."

parents 138279a7 40222ee7

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+5 −5
Original line number Diff line number Diff line
@@ -2239,14 +2239,14 @@ public class GsmCdmaPhone extends Phone { 
                    int current_cdma_roaming_mode =

                            Settings.Global.getInt(getContext().getContentResolver(),

                            Settings.Global.CDMA_ROAMING_MODE,

                            CarrierConfigManager.CDMA_ROAMING_MODE_RADIO_DEFAULT);

                            TelephonyManager.CDMA_ROAMING_MODE_RADIO_DEFAULT);

                    switch (config_cdma_roaming_mode) {

                        // Carrier's cdma_roaming_mode will overwrite the user's previous settings

                        // Keep the user's previous setting in global variable which will be used

                        // when carrier's setting is turn off.

                        case CarrierConfigManager.CDMA_ROAMING_MODE_HOME:

                        case CarrierConfigManager.CDMA_ROAMING_MODE_AFFILIATED:

                        case CarrierConfigManager.CDMA_ROAMING_MODE_ANY:

                        case TelephonyManager.CDMA_ROAMING_MODE_HOME:

                        case TelephonyManager.CDMA_ROAMING_MODE_AFFILIATED:

                        case TelephonyManager.CDMA_ROAMING_MODE_ANY:

                            logd("cdma_roaming_mode is going to changed to "

                                    + config_cdma_roaming_mode);

                            setCdmaRoamingPreference(config_cdma_roaming_mode,
@@ -2255,7 +2255,7 @@ public class GsmCdmaPhone extends Phone { 


                        // When carrier's setting is turn off, change the cdma_roaming_mode to the

                        // previous user's setting

                        case CarrierConfigManager.CDMA_ROAMING_MODE_RADIO_DEFAULT:

                        case TelephonyManager.CDMA_ROAMING_MODE_RADIO_DEFAULT:

                            if (current_cdma_roaming_mode != config_cdma_roaming_mode) {

                                logd("cdma_roaming_mode is going to changed to "

                                        + current_cdma_roaming_mode);

src/java/com/android/internal/telephony/PhoneInternalInterface.java

+5 −5
Original line number Diff line number Diff line
@@ -21,13 +21,13 @@ import android.os.Handler; 
import android.os.Message;

import android.os.ResultReceiver;

import android.os.WorkSource;

import android.telephony.CarrierConfigManager;

import android.telephony.CellLocation;

import android.telephony.ImsiEncryptionInfo;

import android.telephony.NetworkScanRequest;

import android.telephony.ServiceState;

import android.telephony.TelephonyManager;



import com.android.internal.telephony.PhoneConstants.*; // ????

import com.android.internal.telephony.PhoneConstants.DataState;



import java.util.List;
@@ -165,11 +165,11 @@ public interface PhoneInternalInterface { 


    // Used for CDMA roaming mode

    // Home Networks only, as defined in PRL

    static final int CDMA_RM_HOME        = CarrierConfigManager.CDMA_ROAMING_MODE_HOME;

    int CDMA_RM_HOME        = TelephonyManager.CDMA_ROAMING_MODE_HOME;

    // Roaming an Affiliated networks, as defined in PRL

    static final int CDMA_RM_AFFILIATED  = CarrierConfigManager.CDMA_ROAMING_MODE_AFFILIATED;

    int CDMA_RM_AFFILIATED  = TelephonyManager.CDMA_ROAMING_MODE_AFFILIATED;

    // Roaming on Any Network, as defined in PRL

    static final int CDMA_RM_ANY         = CarrierConfigManager.CDMA_ROAMING_MODE_ANY;

    int CDMA_RM_ANY         = TelephonyManager.CDMA_ROAMING_MODE_ANY;



    // Used for CDMA subscription mode

    static final int CDMA_SUBSCRIPTION_UNKNOWN  =-1; // Unknown