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

Commit fdb0b80f authored Feb 12, 2019 by Brad Ebinger Committed by Gerrit Code Review Feb 12, 2019

Merge "Properly release partial wakelock during SRVCC"

parents e0c3771b fcca381b

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;