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

Commit a046fbbe authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Automerger Merge Worker
Browse files

Merge "Add null check of mMsgDecoder before disposing it." into rvc-dev am:... 

Merge "Add null check of mMsgDecoder before disposing it." into rvc-dev am: 181c5439 am: 6dc022a0

Change-Id: I874443514a78d96db03fb6b88ee6ce1779387223
parents 3c10b4e9 6dc022a0

src/java/com/android/internal/telephony/cat/CatService.java

+4 −2
Original line number Diff line number Diff line
@@ -266,8 +266,10 @@ public class CatService extends Handler implements AppInterface { 
                mUiccController.unregisterForIccChanged(this);

                mUiccController = null;

            }

            if (mMsgDecoder != null) {

                mMsgDecoder.dispose();

                mMsgDecoder = null;

            }

            removeCallbacksAndMessages(null);

            if (sInstance != null) {

                if (mSlotId >= 0 && mSlotId < sInstance.length) {