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

Commit 59cc3846 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Do no try to unbind when unbound" am: 93d68399 am: a2be850e 

Change-Id: I18bc8dd4cba32276f7a5f34654c11f001c5b217f
parents 9c3701d8 a2be850e

src/java/com/android/internal/telephony/CellBroadcastServiceManager.java

+4 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public class CellBroadcastServiceManager { 
    private static final int EVENT_NEW_GSM_SMS_CB = 0;

    private static final int EVENT_NEW_CDMA_SMS_CB = 1;

    private static final int EVENT_NEW_CDMA_SCP_MESSAGE = 2;

    private boolean mEnabled;

    private boolean mEnabled = false;



    public CellBroadcastServiceManager(Context context, Phone phone) {

        Log.d(TAG, "CellBroadcastServiceManager created for phone " + phone.getPhoneId());
@@ -111,6 +111,9 @@ public class CellBroadcastServiceManager { 
     * Disable the CB module. The manager's handler will no longer receive CB messages from the RIL.

     */

    public void disable() {

        if (mEnabled == false) {

            return;

        }

        mEnabled = false;

        mPhone.mCi.unSetOnNewGsmBroadcastSms(mModuleCellBroadcastHandler);

        if (sServiceConnection.mService != null) {