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

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

Snap for 11336776 from db88a8c2 to 24Q2-release

Change-Id: I5e8ff183f0a5c63e2e60ad1f49ed50203d67048e
parents bf2d9c6c db88a8c2
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ import android.telecom.ParcelableConference;
import android.telecom.ParcelableConnection;
import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
import android.telecom.Response;
import android.telecom.StatusHints;
import android.telecom.TelecomManager;
import android.telecom.VideoProfile;
@@ -3778,7 +3777,7 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable,
            Log.d(this, "maybeLoadCannedSmsResponses: starting task to load messages");
            mCannedSmsResponsesLoadingStarted = true;
            mCallsManager.getRespondViaSmsManager().loadCannedTextMessages(
                    new Response<Void, List<String>>() {
                    new CallsManager.Response<Void, List<String>>() {
                        @Override
                        public void onResult(Void request, List<String>... result) {
                            if (result.length > 0) {
+23 −4
Original line number Diff line number Diff line
@@ -225,6 +225,29 @@ public class CallsManager extends Call.ListenerBase
        void performAction();
    }

    /**
     * @hide
     */
    public interface Response<IN, OUT> {

        /**
         * Provide a set of results.
         *
         * @param request The original request.
         * @param result The results.
         */
        void onResult(IN request, OUT... result);

        /**
         * Indicates the inability to provide results.
         *
         * @param request The original request.
         * @param code An integer code indicating the reason for failure.
         * @param msg A message explaining the reason for failure.
         */
        void onError(IN request, int code, String msg);
    }

    private static final String TAG = "CallsManager";

    /**
@@ -2977,10 +3000,6 @@ public class CallsManager extends Call.ListenerBase
                Log.d(this, "answerCall: Incoming call = %s Ongoing call %s", call, activeCall);
            }
            // Hold or disconnect the active call and request call focus for the incoming call.
            Bundle bundle = new Bundle();
            bundle.putLong(TelecomManager.EXTRA_CALL_ANSWERED_TIME_MILLIS,
                     mClockProxy.currentTimeMillis());
            call.putConnectionServiceExtras(bundle);
            holdActiveCallForNewCall(call);
            mConnectionSvrFocusMgr.requestFocus(
                    call,
+1 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.content.SharedPreferences;
import android.content.res.Resources;
import android.telecom.Connection;
import android.telecom.Log;
import android.telecom.Response;
import android.telephony.PhoneNumberUtils;
import android.telephony.SmsManager;
import android.telephony.SubscriptionManager;
@@ -92,7 +91,7 @@ public class RespondViaSmsManager extends CallsManagerListenerBase {
     *                 the main thread.
     * @param context The context.
     */
    public void loadCannedTextMessages(final Response<Void, List<String>> response,
    public void loadCannedTextMessages(final CallsManager.Response<Void, List<String>> response,
            final Context context) {
        new Thread() {
            @Override