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

Commit 0db65ec8 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Cleanup to remove misused CallGroup concept. 

- Removed call group references in ImsPhoneCallTracker.

Bug: 18588383

Change-Id: I2128a978299dd7030c98c01f3e4c27ad15fbfa14
parent 373f9fa9

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+2 −9
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ import com.android.ims.ImsManager; 
import com.android.ims.ImsReasonInfo;

import com.android.ims.ImsServiceClass;

import com.android.ims.ImsUtInterface;

import com.android.ims.internal.CallGroup;

import com.android.ims.internal.IImsVideoCallProvider;

import com.android.ims.internal.ImsVideoCallProviderWrapper;

import com.android.internal.telephony.Call;
@@ -834,7 +833,7 @@ public final class ImsPhoneCallTracker extends CallTracker { 
    }



    private void processCallStateChange(ImsCall imsCall, ImsPhoneCall.State state, int cause) {

        if (DBG) log("processCallStateChange state=" + state + " cause=" + cause);

        if (DBG) log("processCallStateChange " + imsCall + " state=" + state + " cause=" + cause);



        if (imsCall == null) return;
@@ -1006,14 +1005,8 @@ public final class ImsPhoneCallTracker extends CallTracker { 
                if (oldState == ImsPhoneCall.State.ACTIVE) {

                    if ((mForegroundCall.getState() == ImsPhoneCall.State.HOLDING)

                            || (mRingingCall.getState() == ImsPhoneCall.State.WAITING)) {

                        boolean isOwner = true;

                        CallGroup callGroup =  imsCall.getCallGroup();

                        if (callGroup != null) {

                            isOwner = callGroup.isOwner(imsCall);

                        }

                        if (isOwner) {



                            sendEmptyMessage(EVENT_RESUME_BACKGROUND);

                        }

                    } else {

                        //when multiple connections belong to background call,

                        //only the first callback reaches here