Snap for 11510485 from 67e27e377533c15457238afa3eb0041d16fc01f1 to 24Q2-release (80eee40c) · Commits · e / os / android_packages_services_Telecomm

flags/telecom_api_flags.aconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -48,4 +48,5 @@ flag{
		namespace: "telecom"
		description: "Enables enriched calling features (e.g. Business name will show for a call)"
		bug: "311688497"
		is_exported: true
		}

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -836,6 +836,16 @@ public class CallAudioRouteController implements CallAudioRouteAdapter {
		CallAudioState oldState = mCallAudioState;
		mCallAudioState = callAudioState;
		mCallsManager.onCallAudioStateChanged(oldState, mCallAudioState);
		updateAudioStateForTrackedCalls(mCallAudioState);
		}

		private void updateAudioStateForTrackedCalls(CallAudioState newCallAudioState) {
		Set<Call> calls = mCallsManager.getTrackedCalls();
		for (Call call : calls) {
		if (call != null && call.getConnectionService() != null) {
		call.getConnectionService().onCallAudioStateChanged(call, newCallAudioState);
		}
		}
		}

		private AudioRoute getPreferredAudioRouteFromStrategy() {

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

+20 −7

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.server.telecom;

		import static android.provider.CallLog.AddCallParams.AddCallParametersBuilder.MAX_NUMBER_OF_CHARACTERS;
		import static android.provider.CallLog.Calls.BLOCK_REASON_NOT_BLOCKED;
		import static android.telephony.CarrierConfigManager.KEY_SUPPORT_IMS_CONFERENCE_EVENT_PACKAGE_BOOL;

		@@ -31,6 +32,7 @@ import android.location.CountryDetector;
		import android.location.Location;
		import android.net.Uri;
		import android.os.AsyncTask;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.HandlerExecutor;
		import android.os.Looper;
		@@ -60,8 +62,6 @@ import java.util.Arrays;
		import java.util.Locale;
		import java.util.Objects;
		import java.util.UUID;
		import java.util.concurrent.Executor;
		import java.util.concurrent.Executors;
		import java.util.stream.Stream;

		/**
		@@ -419,11 +419,24 @@ public final class CallLogManager extends CallsManagerListenerBase {
		paramBuilder.setCallType(callLogType);
		paramBuilder.setIsRead(call.isSelfManaged());
		paramBuilder.setMissedReason(call.getMissedReason());
		if (Flags.businessCallComposer() && call.getExtras() != null) {
		paramBuilder.setIsBusinessCall(call.getExtras().getBoolean(
		android.telecom.Call.EXTRA_IS_BUSINESS_CALL, false));
		paramBuilder.setBusinessName(call.getExtras().getString(
		android.telecom.Call.EXTRA_ASSERTED_DISPLAY_NAME, ""));
		if (mFeatureFlags.businessCallComposer() && call.getExtras() != null) {
		Bundle extras = call.getExtras();
		boolean isBusinessCall =
		extras.getBoolean(android.telecom.Call.EXTRA_IS_BUSINESS_CALL, false);
		paramBuilder.setIsBusinessCall(isBusinessCall);
		if (isBusinessCall) {
		Log.i(TAG, "logging business call");
		String assertedDisplayName =
		extras.getString(android.telecom.Call.EXTRA_ASSERTED_DISPLAY_NAME, "");
		if (assertedDisplayName.length() > MAX_NUMBER_OF_CHARACTERS) {
		// avoid throwing an IllegalArgumentException and only log the first 256
		// characters of the name.
		paramBuilder.setAssertedDisplayName(
		assertedDisplayName.substring(0, MAX_NUMBER_OF_CHARACTERS));
		} else {
		paramBuilder.setAssertedDisplayName(assertedDisplayName);
		}
		}
		}
		sendAddCallBroadcast(callLogType, call.getAgeMillis());

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

+88 −5

Original line number	Diff line number	Diff line
		@@ -82,7 +82,6 @@ import android.provider.BlockedNumberContract;
		import android.provider.BlockedNumberContract.BlockedNumbers;
		import android.provider.CallLog.Calls;
		import android.provider.Settings;
		import android.sysprop.TelephonyProperties;
		import android.telecom.CallAttributes;
		import android.telecom.CallAudioState;
		import android.telecom.CallEndpoint;
		@@ -165,7 +164,6 @@ import java.util.concurrent.CompletableFuture;
		import java.util.concurrent.ConcurrentHashMap;
		import java.util.concurrent.CopyOnWriteArrayList;
		import java.util.concurrent.CountDownLatch;
		import java.util.concurrent.ExecutionException;
		import java.util.concurrent.Executor;
		import java.util.concurrent.Executors;
		import java.util.concurrent.TimeUnit;
		@@ -491,6 +489,7 @@ public class CallsManager extends Call.ListenerBase
		private final UserManager mUserManager;
		private final CallStreamingNotification mCallStreamingNotification;
		private final FeatureFlags mFeatureFlags;
		private final com.android.internal.telephony.flags.FeatureFlags mTelephonyFeatureFlags;

		private final IncomingCallFilterGraphProvider mIncomingCallFilterGraphProvider;

		@@ -610,6 +609,7 @@ public class CallsManager extends Call.ListenerBase
		CallStreamingNotification callStreamingNotification,
		BluetoothDeviceManager bluetoothDeviceManager,
		FeatureFlags featureFlags,
		com.android.internal.telephony.flags.FeatureFlags telephonyFlags,
		IncomingCallFilterGraphProvider incomingCallFilterGraphProvider) {

		mContext = context;
		@@ -717,6 +717,7 @@ public class CallsManager extends Call.ListenerBase
		mCallStreamingController = new CallStreamingController(mContext, mLock);
		mCallStreamingNotification = callStreamingNotification;
		mFeatureFlags = featureFlags;
		mTelephonyFeatureFlags = telephonyFlags;

		if (mFeatureFlags.useImprovedListenerOrder()) {
		mListeners.add(mInCallController);
		@@ -3428,8 +3429,14 @@ public class CallsManager extends Call.ListenerBase
		// then include only that SIM based PhoneAccount and any non-SIM PhoneAccounts, such as SIP.
		@VisibleForTesting
		public List<PhoneAccountHandle> constructPossiblePhoneAccounts(Uri handle, UserHandle user,
		boolean isVideo, boolean isEmergency) {
		return constructPossiblePhoneAccounts(handle, user, isVideo, isEmergency, false);
		boolean isVideo, boolean isEmergency, boolean isConference) {
		if (mTelephonyFeatureFlags.simultaneousCallingIndications()) {
		return constructPossiblePhoneAccountsNew(handle, user, isVideo, isEmergency,
		isConference);
		} else {
		return constructPossiblePhoneAccountsOld(handle, user, isVideo, isEmergency,
		isConference);
		}
		}

		// Returns whether the device is capable of 2 simultaneous active voice calls on different subs.
		@@ -3444,7 +3451,7 @@ public class CallsManager extends Call.ListenerBase
		}
		}

		public List<PhoneAccountHandle> constructPossiblePhoneAccounts(Uri handle, UserHandle user,
		private List<PhoneAccountHandle> constructPossiblePhoneAccountsOld(Uri handle, UserHandle user,
		boolean isVideo, boolean isEmergency, boolean isConference) {

		if (handle == null) {
		@@ -3485,6 +3492,82 @@ public class CallsManager extends Call.ListenerBase
		return allAccounts;
		}

		/**
		* Filters the list of all PhoneAccounts that match the outgoing call Handle's schema against
		* the outgoing call request criteria and the state of the already ongoing calls on the
		* device and their potential simultaneous calling restrictions.
		* @return The filtered List
		*/
		private List<PhoneAccountHandle> constructPossiblePhoneAccountsNew(Uri handle, UserHandle user,
		boolean isVideo, boolean isEmergency, boolean isConference) {
		if (handle == null) {
		return Collections.emptyList();
		}
		// If we're specifically looking for video capable accounts, then include that capability,
		// otherwise specify no additional capability constraints. When handling the emergency call,
		// it also needs to find the phone accounts excluded by CAPABILITY_EMERGENCY_CALLS_ONLY.
		int capabilities = isVideo ? PhoneAccount.CAPABILITY_VIDEO_CALLING : 0;
		capabilities \|= isConference ? PhoneAccount.CAPABILITY_ADHOC_CONFERENCE_CALLING : 0;
		List<PhoneAccountHandle> allAccounts =
		mPhoneAccountRegistrar.getCallCapablePhoneAccounts(handle.getScheme(), false, user,
		capabilities,
		isEmergency ? 0 : PhoneAccount.CAPABILITY_EMERGENCY_CALLS_ONLY,
		isEmergency);
		Log.v(this, "constructPossiblePhoneAccountsNew: allAccounts=" + allAccounts);
		Set<PhoneAccountHandle> activeCallAccounts = mCalls.stream()
		.filter(c -> !c.isDisconnected() && !c.isNew()).map(Call::getTargetPhoneAccount)
		.filter(Objects::nonNull)
		.collect(Collectors.toSet());
		Log.v(this, "constructPossiblePhoneAccountsNew: activeCallAccounts="
		+ activeCallAccounts);
		// No Active calls - all accounts are valid
		if (activeCallAccounts.isEmpty()) return allAccounts;
		// The emergency call should be attempted only over the same SIM PhoneAccounts where there
		// are already ongoing calls - filter out inactive SIM PhoneAccounts in this case.
		if (isEmergency) {
		Set<PhoneAccountHandle> simAccounts =
		new HashSet<>(mPhoneAccountRegistrar.getSimPhoneAccountsOfCurrentUser());
		if (activeCallAccounts.stream().anyMatch(simAccounts::contains)) {
		allAccounts.removeIf(h -> {
		boolean isRemoved = simAccounts.contains(h) && !activeCallAccounts.contains(h);
		if (isRemoved) {
		Log.i(this, "constructPossiblePhoneAccountsNew: removing candidate PAH ["
		+ h + "] because another SIM account is active with an emergency "
		+ "call");
		}
		return isRemoved;
		});
		}
		}
		// Apply restrictions to which PhoneAccounts can be used to place a call by looking at
		// active calls and removing candidate PhoneAccounts if they are from the same source
		// as the active call and the candidate PhoneAccount is not part of the restriction.
		for (PhoneAccountHandle callHandle : activeCallAccounts) {
		allAccounts.removeIf(candidateHandle -> {
		PhoneAccount callAcct = mPhoneAccountRegistrar.getPhoneAccount(callHandle,
		user);
		if (callAcct == null) {
		Log.w(this, "constructPossiblePhoneAccountsNew: unexpected"
		+ "null PA for PAH, removing : " + candidateHandle);
		return true;
		}
		boolean isRemoved = !Objects.equals(candidateHandle, callHandle)
		&& Objects.equals(candidateHandle.getComponentName(),
		callHandle.getComponentName())
		&& callAcct.hasSimultaneousCallingRestriction()
		&& !callAcct.getSimultaneousCallingRestriction().contains(candidateHandle);
		if (isRemoved) {
		Log.i(this, "constructPossiblePhoneAccountsNew: removing candidate"
		+ " PAH [" + candidateHandle + "] because it is not part of the"
		+ " restriction set by [" + callHandle + "], restriction="
		+ callAcct.getSimultaneousCallingRestriction());
		}
		return isRemoved;
		});
		}
		return allAccounts;
		}

		private TelephonyManager getTelephonyManager() {
		return mContext.getSystemService(TelephonyManager.class);
		}

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -230,7 +230,8 @@ public class TelecomSystem {
		Executor asyncTaskExecutor,
		Executor asyncCallAudioTaskExecutor,
		BlockedNumbersAdapter blockedNumbersAdapter,
		FeatureFlags featureFlags) {
		FeatureFlags featureFlags,
		com.android.internal.telephony.flags.FeatureFlags telephonyFlags) {
		mContext = context.getApplicationContext();
		mFeatureFlags = featureFlags;
		LogUtils.initLogging(mContext);
		@@ -427,6 +428,7 @@ public class TelecomSystem {
		callStreamingNotification,
		bluetoothDeviceManager,
		featureFlags,
		telephonyFlags,
		IncomingCallFilterGraph::new);

		mIncomingCallNotifier = incomingCallNotifier;