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

Commit 8cc2765b authored by Thomas Stuart's avatar Thomas Stuart
Browse files

remove internal helpers (array.contains & String.formatSimple) 

As a part of a bigger project to make telecom a mainline module,
internal helper functions cannot be referenced and need to
be replaced by stable APIs.

Flag: com.android.server.telecom.flags.resolve_hidden_dependencies_two
Fixes: 308212397
Test: atest TelecomUnitTests
Change-Id: Ie324cb9e9317dbffdb04a847f45975f1693f8eeb
parent 11242d1a

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

+10 −2
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ import java.util.UUID; 
import java.util.concurrent.CompletableFuture;

import java.util.concurrent.TimeUnit;

import java.util.stream.Collectors;

import java.util.stream.IntStream;

import java.util.stream.Stream;



/**
@@ -3293,8 +3294,15 @@ public class InCallController extends CallsManagerListenerBase implements 
     */

    private boolean isTrackingManagedAliveCall() {

        return mCallIdMapper.getCalls().stream().anyMatch(c -> !c.isExternalCall()

            && !c.isSelfManaged() && c.isAlive() && ArrayUtils.contains(LIVE_CALL_STATES,

                c.getState()));

                && !c.isSelfManaged() && c.isAlive() && isCallInLiveCallState(c));

    }



    private boolean isCallInLiveCallState(Call call) {

        if (mFeatureFlags.resolveHiddenDependenciesTwo()) {

            return IntStream.of(LIVE_CALL_STATES).anyMatch(element -> element == call.getState());

        } else {

            return ArrayUtils.contains(LIVE_CALL_STATES, call.getState());

        }

    }



    private boolean isCarrierPrivilegedUsingMicDuringVoipCall() {

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

+6 −7
Original line number Diff line number Diff line
@@ -33,20 +33,19 @@ import android.telecom.CallStreamingService; 
import android.telecom.DisconnectCause;

import android.telecom.Log;

import android.telecom.PhoneAccountHandle;

import android.text.TextUtils;



import androidx.annotation.VisibleForTesting;



import com.android.internal.telecom.ICallControl;

import com.android.internal.telecom.ICallEventCallback;

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

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

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

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

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

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

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

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

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

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

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

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

import com.android.server.telecom.flags.FeatureFlags;



import java.util.Locale;
@@ -310,8 +309,8 @@ public class TransactionalServiceWrapper implements 
            } else {

                Bundle exceptionBundle = new Bundle();

                exceptionBundle.putParcelable(TRANSACTION_EXCEPTION_KEY,

                        new CallException(TextUtils.formatSimple(

                        "Telecom cannot process [%s] because the call with id=[%s] is no longer "

                        new CallException(String.format("Telecom cannot process [%s] because the"

                                + " call with id=[%s] is no longer "

                                + "being tracked. This is most likely a result of the call "

                                + "already being disconnected and removed. Try re-adding the call"

                                + " via TelecomManager#addCall", action, callId),