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

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

am e188b658: Fix NPE when exiting DcDefaultState. DO NOT MERGE. 

* commit 'e188b658':
  Fix NPE when exiting DcDefaultState. DO NOT MERGE.
parents 16758906 e188b658

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

+5 −7
Original line number Diff line number Diff line
@@ -779,6 +779,11 @@ public final class DataConnection extends StateMachine { 
        public void exit() {

            if (DBG) log("DcDefaultState: exit");



            // Unregister for DRS or RAT change.

            mPhone.getServiceStateTracker().unregisterForDataRegStateOrRatChanged(getHandler());



            // Remove ourselves from the DC lists

            mDcController.removeDc(DataConnection.this);



            if (mAc != null) {

                mAc.disconnected();
@@ -795,13 +800,6 @@ public final class DataConnection extends StateMachine { 
            mLinkCapabilities = null;

            mLastFailCause = null;

            mUserData = null;



            // Unregister for DRS or RAT change.

            mPhone.getServiceStateTracker().unregisterForDataRegStateOrRatChanged(getHandler());



            // Remove ourselves from the DC lists

            mDcController.removeDc(DataConnection.this);



            mDcController = null;

            mDcTesterFailBringUpAll = null;

        }