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

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

am ef57a331: Merge "Telephony: Handle RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE" 

* commit 'ef57a331':
  Telephony: Handle RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE
parents 23ab767b ef57a331

src/java/com/android/internal/telephony/cdma/CDMAPhone.java

+3 −0
Original line number Diff line number Diff line
@@ -205,6 +205,8 @@ public class CDMAPhone extends PhoneBase { 
        mCi.setOnSuppServiceNotification(this, EVENT_SSN, null);

        mSST.registerForNetworkAttached(this, EVENT_REGISTERED_TO_NETWORK, null);

        mCi.setEmergencyCallbackMode(this, EVENT_EMERGENCY_CALLBACK_MODE_ENTER, null);

        mCi.registerForExitEmergencyCallbackMode(this, EVENT_EXIT_EMERGENCY_CALLBACK_RESPONSE,

                null);



        PowerManager pm

            = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
@@ -259,6 +261,7 @@ public class CDMAPhone extends PhoneBase { 
            mCi.unregisterForOn(this); //EVENT_RADIO_ON

            mSST.unregisterForNetworkAttached(this); //EVENT_REGISTERED_TO_NETWORK

            mCi.unSetOnSuppServiceNotification(this);

            mCi.unregisterForExitEmergencyCallbackMode(this);

            removeCallbacks(mExitEcmRunnable);



            mPendingMmis.clear();