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

Commit 5fa827cc authored by Geo Piskas's avatar Geo Piskas
Browse files

Fixed FC on calling unregisterReceiver with non registered receiver arg. 

Crash Log: http://pastebin.com/r0qSGvbb

Patchset 1: Fixed a tab.

Patchset 2: Fixed spacing.

Change-Id: Idd3a7d28d62a980e5d8841535b0c9b57ea6e6a01
parent dac9376c

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

+22 −16
Original line number Diff line number Diff line
@@ -106,6 +106,8 @@ public final class CallManager { 


    private boolean mSpeedUpAudioForMtCall = false;



    private boolean mRingVolumeReceiverIsRegistered = false;



    // state registrants

    protected final RegistrantList mPreciseCallStateRegistrants

    = new RegistrantList();
@@ -449,8 +451,12 @@ public final class CallManager { 
        if (state == PhoneConstants.State.RINGING && lastAudioMode != AudioManager.MODE_RINGTONE) {

            context.registerReceiver(mRingVolumeChangeReceiver,

                    new IntentFilter(AudioManager.VOLUME_CHANGED_ACTION));

            mRingVolumeReceiverIsRegistered = true;

        } else if (state != PhoneConstants.State.RINGING && lastAudioMode == AudioManager.MODE_RINGTONE) {

            if (mRingVolumeReceiverIsRegistered) {

                context.unregisterReceiver(mRingVolumeChangeReceiver);

                mRingVolumeReceiverIsRegistered = false;

            }

        }

    }