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

Commit ec18268e authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 1146bddf: Merge "Always clear settings when entering Inactive state." into honeycomb-LTE 

* commit '1146bddf':
  Always clear settings when entering Inactive state.
parents edfdef92 1146bddf

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -228,7 +228,6 @@ public abstract class DataConnection extends StateMachine { 
        mId = id;

        mId = id;

        mRetryMgr = rm;

        mRetryMgr = rm;

        this.cid = -1;

        this.cid = -1;

        clearSettings();





        setDbg(false);

        setDbg(false);

        addState(mDefaultState);

        addState(mDefaultState);
@@ -313,7 +312,6 @@ public abstract class DataConnection extends StateMachine { 
            AsyncResult.forMessage(msg);

            AsyncResult.forMessage(msg);

            msg.sendToTarget();

            msg.sendToTarget();

        }

        }

        clearSettings();

        if (DBG) log("NotifyDisconnectCompleted DisconnectParams=" + dp);

        if (DBG) log("NotifyDisconnectCompleted DisconnectParams=" + dp);

    }

    }
@@ -632,7 +630,6 @@ public abstract class DataConnection extends StateMachine { 
                }

                }

                case DataConnectionAc.REQ_RESET:

                case DataConnectionAc.REQ_RESET:

                    if (VDBG) log("DcDefaultState: msg.what=REQ_RESET");

                    if (VDBG) log("DcDefaultState: msg.what=REQ_RESET");

                    clearSettings();

                    mAc.replyToMessage(msg, DataConnectionAc.RSP_RESET);

                    mAc.replyToMessage(msg, DataConnectionAc.RSP_RESET);

                    transitionTo(mInactiveState);

                    transitionTo(mInactiveState);

                    break;

                    break;
@@ -718,6 +715,7 @@ public abstract class DataConnection extends StateMachine { 
                if (VDBG) log("DcInactiveState: enter notifyDisconnectCompleted");

                if (VDBG) log("DcInactiveState: enter notifyDisconnectCompleted");

                notifyDisconnectCompleted(mDisconnectParams);

                notifyDisconnectCompleted(mDisconnectParams);

            }

            }

            clearSettings();

        }

        }





        @Override

        @Override