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

Commit 27675906 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Properly release partial wakelock during SRVCC" am: fdb0b80f 

am: 89b74b58

Change-Id: I5e4ec9460dbf072139a1c91783e5bc51857d8668
parents 6028b259 89b74b58

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

+2 −0
Original line number Diff line number Diff line
@@ -860,6 +860,8 @@ public class GsmCdmaCallTracker extends CallTracker { 
                                hoConnection.mPreHandoverState != GsmCdmaCall.State.HOLDING &&

                                dc.state == DriverCall.State.ACTIVE) {

                            mConnections[i].onConnectedInOrOut();

                        } else {

                            mConnections[i].onConnectedConnectionMigrated();

                        }



                        mHandoverConnections.remove(hoConnection);

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

+10 −0
Original line number Diff line number Diff line
@@ -780,6 +780,16 @@ public class GsmCdmaConnection extends Connection { 
        }

    }



    /**

     * We have completed the migration of another connection to this GsmCdmaConnection (for example,

     * in the case of SRVCC) and not still DIALING/ALERTING/INCOMING/WAITING.

     */

    void onConnectedConnectionMigrated() {

        // We can release the wakelock in this case, the migrated call is not still

        // DIALING/ALERTING/INCOMING/WAITING.

        releaseWakeLock();

    }



    private void

    doDisconnect() {

        mIndex = -1;