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

Commit f929c6f2 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10233678 from 22547912 to udc-release 

Change-Id: I7c933c2c65522647ce07334b91ce26bbbb318e68
parents 4e4bdae1 22547912

res/values-ca/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
    <string name="notification_channel_background_calls" msgid="7785659903711350506">"Trucades en segon pla"</string>

    <string name="notification_channel_disconnected_calls" msgid="8228636543997645757">"Trucades desconnectades"</string>

    <string name="notification_channel_in_call_service_crash" msgid="7313237519166984267">"Aplicacions del telèfon que han fallat"</string>

    <string name="notification_channel_call_streaming" msgid="5100510699787538991">"Reproducció en continu de trucades"</string>

    <string name="notification_channel_call_streaming" msgid="5100510699787538991">"Reproducció en directe de trucada"</string>

    <string name="alert_outgoing_call" msgid="5319895109298927431">"En fer aquesta trucada, finalitzarà la de l\'aplicació <xliff:g id="OTHER_APP">%1$s</xliff:g>."</string>

    <string name="alert_redirect_outgoing_call_or_not" msgid="665409645789521636">"Tria com vols fer aquesta trucada"</string>

    <string name="alert_place_outgoing_call_with_redirection" msgid="5221065030959024121">"Desvia la trucada amb <xliff:g id="OTHER_APP">%1$s</xliff:g>"</string>

res/values-mk/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ 
    <string name="phone_settings_number_not_in_contact_txt" msgid="2602249106007265757">"Броеви што не се наведени во „Контакти“"</string>

    <string name="phone_settings_number_not_in_contact_summary_txt" msgid="963327038085718969">"Блокирани броеви што не се наведени во вашите „Контакти“"</string>

    <string name="phone_settings_private_num_txt" msgid="6339272760338475619">"Приватно"</string>

    <string name="phone_settings_private_num_summary_txt" msgid="6755758240544021037">"Блокирај повикувачи со сокриен број"</string>

    <string name="phone_settings_private_num_summary_txt" msgid="6755758240544021037">"Блокирај повикувачи со скриен број"</string>

    <string name="phone_settings_payphone_txt" msgid="5003987966052543965">"Телефонска говорница"</string>

    <string name="phone_settings_payphone_summary_txt" msgid="3936631076065563665">"Блокирај повици од телефонски говорници"</string>

    <string name="phone_settings_unknown_txt" msgid="3577926178354772728">"Непознато"</string>

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

+48 −0
Original line number Diff line number Diff line
@@ -39,9 +39,12 @@ import android.telecom.StreamingCall; 
import android.telecom.Log;



import com.android.internal.telecom.ICallStreamingService;

import com.android.server.telecom.voip.ParallelTransaction;

import com.android.server.telecom.voip.SerialTransaction;

import com.android.server.telecom.voip.VoipCallTransaction;

import com.android.server.telecom.voip.VoipCallTransactionResult;



import java.util.ArrayList;

import java.util.List;

import java.util.concurrent.CompletableFuture;

import java.util.concurrent.CompletionStage;
@@ -265,6 +268,51 @@ public class CallStreamingController extends CallsManagerListenerBase { 
        }

    }



    public class StartStreamingTransaction extends SerialTransaction {

        private Call mCall;



        public StartStreamingTransaction(List<VoipCallTransaction> subTransactions, Call call,

                TelecomSystem.SyncRoot lock) {

            super(subTransactions, lock);

            mCall = call;

        }



        @Override

        public void handleTransactionFailure() {

            mTransactionalServiceWrapper.stopCallStreaming(mCall);

        }

    }



    public VoipCallTransaction getStartStreamingTransaction(CallsManager callsManager,

            TransactionalServiceWrapper wrapper, Call call, TelecomSystem.SyncRoot lock) {

        // start streaming transaction flow:

        //     1. make sure there's no ongoing streaming call --> bind to EXO

        //     2. change audio mode

        //     3. bind to EXO

        // If bind to EXO failed, add transaction for stop the streaming



        // create list for multiple transactions

        List<VoipCallTransaction> transactions = new ArrayList<>();

        transactions.add(new QueryCallStreamingTransaction(callsManager));

        transactions.add(new AudioInterceptionTransaction(call, true, lock));

        transactions.add(getCallStreamingServiceTransaction(

                callsManager.getContext(), wrapper, call));

        return new StartStreamingTransaction(transactions, call, lock);

    }



    public VoipCallTransaction getStopStreamingTransaction(Call call, TelecomSystem.SyncRoot lock) {

        // TODO: implement this

        // Stop streaming transaction flow:

        List<VoipCallTransaction> transactions = new ArrayList<>();



        // 1. unbind to call streaming service

        transactions.add(getUnbindStreamingServiceTransaction());

        // 2. audio route operations

        transactions.add(new CallStreamingController.AudioInterceptionTransaction(call,

                false, lock));

        return new ParallelTransaction(transactions, lock);

    }



    @Override

    public void onCallRemoved(Call call) {

        if (mStreamingCall == call) {

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

100644 → 100755
+31 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.pm.PackageManager; 
import android.location.Location;

import android.location.LocationManager;

import android.location.LocationRequest;

import android.graphics.drawable.Icon;

import android.net.Uri;

import android.os.Binder;

import android.os.Bundle;
@@ -100,10 +101,17 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                ParcelableConnection connection, Session.Info sessionInfo) {

            Log.startSession(sessionInfo, LogUtils.Sessions.CSW_HANDLE_CREATE_CONNECTION_COMPLETE,

                    mPackageAbbreviation);

            UserHandle callingUserHandle = Binder.getCallingUserHandle();

            long token = Binder.clearCallingIdentity();

            try {

                synchronized (mLock) {

                    logIncoming("handleCreateConnectionComplete %s", callId);

                    // Check status hints image for cross user access

                    if (connection.getStatusHints() != null) {

                        Icon icon = connection.getStatusHints().getIcon();

                        connection.getStatusHints().setIcon(StatusHints.

                                validateAccountIconUserBoundary(icon, callingUserHandle));

                    }

                    ConnectionServiceWrapper.this

                            .handleCreateConnectionComplete(callId, request, connection);
@@ -504,6 +512,14 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
            Log.startSession(sessionInfo, LogUtils.Sessions.CSW_ADD_CONFERENCE_CALL,

                    mPackageAbbreviation);



            UserHandle callingUserHandle = Binder.getCallingUserHandle();

            // Check status hints image for cross user access

            if (parcelableConference.getStatusHints() != null) {

                Icon icon = parcelableConference.getStatusHints().getIcon();

                parcelableConference.getStatusHints().setIcon(StatusHints.

                        validateAccountIconUserBoundary(icon, callingUserHandle));

            }



            if (parcelableConference.getConnectElapsedTimeMillis() != 0

                    && mContext.checkCallingOrSelfPermission(MODIFY_PHONE_STATE)

                            != PackageManager.PERMISSION_GRANTED) {
@@ -769,10 +785,17 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
        public void setStatusHints(String callId, StatusHints statusHints,

                Session.Info sessionInfo) {

            Log.startSession(sessionInfo, "CSW.sSH", mPackageAbbreviation);

            UserHandle callingUserHandle = Binder.getCallingUserHandle();

            long token = Binder.clearCallingIdentity();

            try {

                synchronized (mLock) {

                    logIncoming("setStatusHints %s %s", callId, statusHints);

                    // Check status hints image for cross user access

                    if (statusHints != null) {

                        Icon icon = statusHints.getIcon();

                        statusHints.setIcon(StatusHints.validateAccountIconUserBoundary(

                                icon, callingUserHandle));

                    }

                    Call call = mCallIdMapper.getCall(callId);

                    if (call != null) {

                        call.setStatusHints(statusHints);
@@ -1007,6 +1030,14 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                                    connection.getCallDirection(),

                                    connection.getCallerNumberVerificationStatus());

                        }



                        // Check status hints image for cross user access

                        if (connection.getStatusHints() != null) {

                            Icon icon = connection.getStatusHints().getIcon();

                            connection.getStatusHints().setIcon(StatusHints.

                                    validateAccountIconUserBoundary(icon, userHandle));

                        }



                        // Check to see if this Connection has already been added.

                        Call alreadyAddedConnection = mCallsManager

                                .getAlreadyAddedConnection(connectIdToCheck);

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

+2 −1
Original line number Diff line number Diff line
@@ -1739,7 +1739,8 @@ public class InCallController extends CallsManagerListenerBase implements 


        IntentFilter packageChangedFilter = new IntentFilter(Intent.ACTION_PACKAGE_CHANGED);

        packageChangedFilter.addDataScheme("package");

        mContext.registerReceiver(mPackageChangedReceiver, packageChangedFilter);

        mContext.registerReceiverAsUser(mPackageChangedReceiver, UserHandle.ALL,

                packageChangedFilter, null, null);

    }



    private void updateNonUiInCallServices(Call call) {