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

Commit 3ed1a692 authored by Thomas Stuart's avatar Thomas Stuart
Browse files

handle 2 calls from the same app case in VoipCallMonitor 

It was pointed out that AM was throwing an exception when a second
voip call was added to telecom for the same app.  Upon investigation,
foreground service delegation should only be granted once for an app
instead of on a per call basis.

Changes:
- FGS is started ONLY if the application does not have it already
  instead of every time the call is added
- FGS is revoked if the notification is removed and the call is
  not disconnected after 5 seconds
- only support call-style notifications posted AFTER the call is
  added
- The logging around FGS events has changed.  Prev logged when
  start/stop requests are sent to AM. Now, fgs gain/revoked is
  logged when AM calls the service.

Flag: com.android.server.telecom.flags.voip_call_monitor_refactor
Bug: 381129034
Test: manual
Change-Id: Ic5f02575b1efc72d5e848907bd1006ca4cdf2edb
parent 8f3a7152

flags/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -46,5 +46,6 @@ aconfig_declarations { 
        "telecom_headless_system_user_mode.aconfig",

        "telecom_session_flags.aconfig",

        "telecom_metrics_flags.aconfig",

        "telecom_voip_flags.aconfig",

    ],

}

flags/telecom_voip_flags.aconfig

0 → 100644
+13 −0
Original line number Diff line number Diff line 
package: "com.android.server.telecom.flags"

container: "system"



# OWNER=tjstuart TARGET=25Q2

flag {

  name: "voip_call_monitor_refactor"

  namespace: "telecom"

  description: "VoipCallMonitor reworked to handle multi calling scenarios for the same app"

  bug: "381129034"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}
 
 No newline at end of file

src/com/android/server/telecom/Call.java

+0 −1
Original line number Diff line number Diff line
@@ -1883,7 +1883,6 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
        return mTargetPhoneAccountHandle;

    }



    @VisibleForTesting

    public PhoneAccountHandle getTargetPhoneAccount() {

        return mTargetPhoneAccountHandle;

    }

src/com/android/server/telecom/CallsManager.java

+16 −3
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ import com.android.server.telecom.ui.IncomingCallNotifier; 
import com.android.server.telecom.ui.ToastFactory;

import com.android.server.telecom.callsequencing.voip.VoipCallMonitor;

import com.android.server.telecom.callsequencing.TransactionManager;

import com.android.server.telecom.callsequencing.voip.VoipCallMonitorLegacy;



import java.util.ArrayList;

import java.util.Arrays;
@@ -488,6 +489,7 @@ public class CallsManager extends Call.ListenerBase 
    private final EmergencyCallHelper mEmergencyCallHelper;

    private final RoleManagerAdapter mRoleManagerAdapter;

    private final VoipCallMonitor mVoipCallMonitor;

    private final VoipCallMonitorLegacy mVoipCallMonitorLegacy;

    private final CallEndpointController mCallEndpointController;

    private final CallAnomalyWatchdog mCallAnomalyWatchdog;
@@ -763,12 +765,18 @@ public class CallsManager extends Call.ListenerBase 
        mClockProxy = clockProxy;

        mToastFactory = toastFactory;

        mRoleManagerAdapter = roleManagerAdapter;

        mVoipCallMonitor = new VoipCallMonitor(mContext, mLock);

        mTransactionManager = transactionManager;

        mBlockedNumbersAdapter = blockedNumbersAdapter;

        mCallStreamingController = new CallStreamingController(mContext, mLock);

        mCallStreamingNotification = callStreamingNotification;

        mFeatureFlags = featureFlags;

        if (mFeatureFlags.voipCallMonitorRefactor()) {

            mVoipCallMonitor = new VoipCallMonitor(mContext, mLock);

            mVoipCallMonitorLegacy = null;

        } else {

            mVoipCallMonitor = null;

            mVoipCallMonitorLegacy = new VoipCallMonitorLegacy(mContext, mLock);

        }

        mTelephonyFeatureFlags = telephonyFlags;

        mMetricsController = metricsController;

        mBlockedNumbersManager = mFeatureFlags.telecomMainlineBlockedNumbersManager()
@@ -804,13 +812,18 @@ public class CallsManager extends Call.ListenerBase 


        // this needs to be after the mCallAudioManager

        mListeners.add(mPhoneStateBroadcaster);

        mListeners.add(mVoipCallMonitor);

        mListeners.add(mCallStreamingNotification);

        if (featureFlags.enableCallAudioWatchdog()) {

            mListeners.add(mCallAudioWatchDog);

        }



        mVoipCallMonitor.startMonitor();

        if (mFeatureFlags.voipCallMonitorRefactor()) {

            mVoipCallMonitor.registerNotificationListener();

            mListeners.add(mVoipCallMonitor);

        } else {

            mVoipCallMonitorLegacy.startMonitor();

            mListeners.add(mVoipCallMonitorLegacy);

        }



        // There is no USER_SWITCHED broadcast for user 0, handle it here explicitly.

        final UserManager userManager = mContext.getSystemService(UserManager.class);

src/com/android/server/telecom/LogUtils.java

+2 −0
Original line number Diff line number Diff line
@@ -226,6 +226,8 @@ public class LogUtils { 
        public static final String FLASH_NOTIFICATION_START = "FLASH_NOTIFICATION_START";

        public static final String FLASH_NOTIFICATION_STOP = "FLASH_NOTIFICATION_STOP";

        public static final String GAINED_FGS_DELEGATION = "GAINED_FGS_DELEGATION";

        public static final String ALREADY_HAS_FGS_DELEGATION = "ALREADY_HAS_FGS_DELEGATION";

        public static final String MAINTAINING_FGS_DELEGATION = "MAINTAINING_FGS_DELEGATION";

        public static final String GAIN_FGS_DELEGATION_FAILED = "GAIN_FGS_DELEGATION_FAILED";

        public static final String LOST_FGS_DELEGATION = "LOST_FGS_DELEGATION";

        public static final String START_STREAMING = "START_STREAMING";