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

Commit 477dc15c authored by Malcolm Chen's avatar Malcolm Chen
Browse files

Add null check of mMsgDecoder before disposing it. 

Bug: 155433261
Test: manual test - make sure no crash if called multiple times
Change-Id: I28d33f14f70f01cf2fe87ee36548ebf95ad32485
Merged-In: I28d33f14f70f01cf2fe87ee36548ebf95ad32485
parent 33366acc

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

+4 −2
Original line number Diff line number Diff line
@@ -269,8 +269,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) {