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

Commit 6698f84f authored by Feixiong Zhang's avatar Feixiong Zhang Committed by Android (Google) Code Review
Browse files

Merge "add PhoneStateListener in DcController which fires at... 

Merge "add PhoneStateListener in DcController which fires at carrierNetworkChange event." into mnc-dev
parents b507a182 22ae2cc3

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

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ public interface Phone { 
    static final String REASON_DATA_SPECIFIC_DISABLED = "specificDisabled";

    static final String REASON_SIM_NOT_READY = "simNotReady";

    static final String REASON_IWLAN_AVAILABLE = "iwlanAvailable";

    static final String REASON_CARRIER_CHANGE = "carrierChange";



    // Used for band mode selection methods

    static final int BM_UNSPECIFIED = 0; // selected by baseband automatically

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+3 −1
Original line number Diff line number Diff line
@@ -1745,7 +1745,9 @@ public final class DataConnection extends StateMachine { 
        public void exit() {

            if (DBG) log("DcActiveState: exit dc=" + this);

            String reason = mNetworkInfo.getReason();

            if (mDisconnectParams != null && mDisconnectParams.mReason != null) {

            if(mDcController.isExecutingCarrierChange()) {

                reason = Phone.REASON_CARRIER_CHANGE;

            } else if (mDisconnectParams != null && mDisconnectParams.mReason != null) {

                reason = mDisconnectParams.mReason;

            } else if (mDcFailCause != null) {

                reason = mDcFailCause.toString();

src/java/com/android/internal/telephony/dataconnection/DcController.java

+28 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.internal.telephony.dataconnection;



import android.content.Context;

import android.net.LinkAddress;

import android.net.NetworkUtils;

import android.net.LinkProperties.CompareResult;
@@ -25,6 +26,8 @@ import android.os.Handler; 
import android.os.Message;

import android.os.SystemClock;

import android.telephony.DataConnectionRealTimeInfo;

import android.telephony.TelephonyManager;

import android.telephony.PhoneStateListener;

import android.telephony.Rlog;



import com.android.internal.telephony.DctConstants;
@@ -73,6 +76,13 @@ class DcController extends StateMachine { 


    private DccDefaultState mDccDefaultState = new DccDefaultState();



    TelephonyManager mTelephonyManager;

    private PhoneStateListener mPhoneStateListener;



    //mExecutingCarrierChange tracks whether the phone is currently executing

    //carrier network change

    private volatile boolean mExecutingCarrierChange;



    /**

     * Constructor.

     *
@@ -91,6 +101,19 @@ class DcController extends StateMachine { 
        addState(mDccDefaultState);

        setInitialState(mDccDefaultState);

        log("X ctor");



        mPhoneStateListener = new PhoneStateListener(handler.getLooper()) {

            @Override

            public void onCarrierNetworkChange(boolean active) {

                mExecutingCarrierChange = active;

            }

        };



        mTelephonyManager = (TelephonyManager) phone.getContext().getSystemService(Context.TELEPHONY_SERVICE);

        if(mTelephonyManager != null) {

            mTelephonyManager.listen(mPhoneStateListener,

                    PhoneStateListener.LISTEN_CARRIER_NETWORK_CHANGE);

        }

    }



    static DcController makeDcc(PhoneBase phone, DcTrackerBase dct, Handler handler) {
@@ -101,6 +124,7 @@ class DcController extends StateMachine { 


    void dispose() {

        log("dispose: call quiteNow()");

        if(mTelephonyManager != null) mTelephonyManager.listen(mPhoneStateListener, 0);

        quitNow();

    }
@@ -127,6 +151,10 @@ class DcController extends StateMachine { 
        }

    }



    boolean isExecutingCarrierChange() {

        return mExecutingCarrierChange;

    }



    private class DccDefaultState extends State {

        @Override

        public void enter() {