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

Commit dad36ded authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Add extra key to StreamingCall." into udc-dev am: 6bbc974a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22912877



Change-Id: Idff67848c9ce429d2be8254e4760f13fdb36e6bc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 622bbeca 6bbc974a

telecomm/java/android/telecom/CallStreamingService.java

+8 −1
Original line number Diff line number Diff line
@@ -73,22 +73,26 @@ public abstract class CallStreamingService extends Service { 
        @Override

        public void handleMessage(Message msg) {

            if (mStreamingCallAdapter == null && msg.what != MSG_SET_STREAMING_CALL_ADAPTER) {

                Log.i(this, "handleMessage: null adapter!");

                return;

            }



            switch (msg.what) {

                case MSG_SET_STREAMING_CALL_ADAPTER:

                    if (msg.obj != null) {

                        Log.i(this, "MSG_SET_STREAMING_CALL_ADAPTER");

                        mStreamingCallAdapter = new StreamingCallAdapter(

                                (IStreamingCallAdapter) msg.obj);

                    }

                    break;

                case MSG_CALL_STREAMING_STARTED:

                    Log.i(this, "MSG_CALL_STREAMING_STARTED");

                    mCall = (StreamingCall) msg.obj;

                    mCall.setAdapter(mStreamingCallAdapter);

                    CallStreamingService.this.onCallStreamingStarted(mCall);

                    break;

                case MSG_CALL_STREAMING_STOPPED:

                    Log.i(this, "MSG_CALL_STREAMING_STOPPED");

                    mCall = null;

                    mStreamingCallAdapter = null;

                    CallStreamingService.this.onCallStreamingStopped();
@@ -109,6 +113,7 @@ public abstract class CallStreamingService extends Service { 
    @Nullable

    @Override

    public IBinder onBind(@NonNull Intent intent) {

        Log.i(this, "onBind");

        return new CallStreamingServiceBinder();

    }
@@ -117,12 +122,14 @@ public abstract class CallStreamingService extends Service { 
        @Override

        public void setStreamingCallAdapter(IStreamingCallAdapter streamingCallAdapter)

                throws RemoteException {

            mHandler.obtainMessage(MSG_SET_STREAMING_CALL_ADAPTER, mStreamingCallAdapter)

            Log.i(this, "setCallStreamingAdapter");

            mHandler.obtainMessage(MSG_SET_STREAMING_CALL_ADAPTER, streamingCallAdapter)

                    .sendToTarget();

        }



        @Override

        public void onCallStreamingStarted(StreamingCall call) throws RemoteException {

            Log.i(this, "onCallStreamingStarted");

            mHandler.obtainMessage(MSG_CALL_STREAMING_STARTED, call).sendToTarget();

        }

telecomm/java/android/telecom/StreamingCall.java

+6 −0
Original line number Diff line number Diff line
@@ -54,6 +54,12 @@ public final class StreamingCall implements Parcelable { 
     */

    public static final int STATE_DISCONNECTED = 3;



    /**

     * The ID associated with this call.  This is the same value as {@link CallControl#getCallId()}.

     * @hide

     */

    public static final String EXTRA_CALL_ID = "android.telecom.extra.CALL_ID";



    /**

     * @hide

     */