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

Commit c04f09d4 authored by John Huang's avatar John Huang Committed by Android Git Automerger
Browse files

am 3c85e84a: Merge "Don\'t lose the apn data on RAT/DRS change" into mnc-dr-dev 

* commit '3c85e84a':
  Don't lose the apn data on RAT/DRS change
parents 6ee475d3 3c85e84a

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

+6 −3
Original line number Diff line number Diff line
@@ -1278,17 +1278,20 @@ public final class DataConnection extends StateMachine { 
        // if we are not in-service change to SUSPENDED

        final ServiceStateTracker sst = mPhone.getServiceStateTracker();

        if (sst.getCurrentDataConnectionState() != ServiceState.STATE_IN_SERVICE) {

            mNetworkInfo.setDetailedState(NetworkInfo.DetailedState.SUSPENDED, null, null);

            mNetworkInfo.setDetailedState(NetworkInfo.DetailedState.SUSPENDED, null,

                    mNetworkInfo.getExtraInfo());

        } else {

            // check for voice call and concurrency issues

            if (sst.isConcurrentVoiceAndDataAllowed() == false) {

                final CallTracker ct = mPhone.getCallTracker();

                if (ct.getState() != PhoneConstants.State.IDLE) {

                    mNetworkInfo.setDetailedState(NetworkInfo.DetailedState.SUSPENDED, null, null);

                    mNetworkInfo.setDetailedState(NetworkInfo.DetailedState.SUSPENDED, null,

                            mNetworkInfo.getExtraInfo());

                    return (oldState != NetworkInfo.DetailedState.SUSPENDED);

                }

            }

            mNetworkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, null, null);

            mNetworkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, null,

                    mNetworkInfo.getExtraInfo());

        }

        return (oldState != mNetworkInfo.getDetailedState());

    }