Change sendSessionModifyRequest VideoProvider API signature.

Bug: 20704229
Change-Id: I7650b6ae21532b10f901449f702f3a4b59477696

2 files changed, 22 insertions, 8 deletions

diff --git a/src/java/com/android/ims/internal/ImsVideoCallProvider.java b/src/java/com/android/ims/internal/ImsVideoCallProvider.java
index ae70e924..79c81ea1 100644
--- a/src/java/com/android/ims/internal/ImsVideoCallProvider.java
+++ b/src/java/com/android/ims/internal/ImsVideoCallProvider.java
@@ -16,6 +16,8 @@
 
 package com.android.ims.internal;
 
+import com.android.internal.os.SomeArgs;
+
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
@@ -67,9 +69,18 @@ public abstract class ImsVideoCallProvider {
                 case MSG_SET_ZOOM:
                     onSetZoom((Float) msg.obj);
                     break;
-                case MSG_SEND_SESSION_MODIFY_REQUEST:
-                    onSendSessionModifyRequest((VideoProfile) msg.obj);
+                case MSG_SEND_SESSION_MODIFY_REQUEST: {
+                    SomeArgs args = (SomeArgs) msg.obj;
+                    try {
+                        VideoProfile fromProfile = (VideoProfile) args.arg1;
+                        VideoProfile toProfile = (VideoProfile) args.arg2;
+
+                        onSendSessionModifyRequest(fromProfile, toProfile);
+                    } finally {
+                        args.recycle();
+                    }
                     break;
+                }
                 case MSG_SEND_SESSION_MODIFY_RESPONSE:
                     onSendSessionModifyResponse((VideoProfile) msg.obj);
                     break;
@@ -116,9 +127,11 @@ public abstract class ImsVideoCallProvider {
             mProviderHandler.obtainMessage(MSG_SET_ZOOM, value).sendToTarget();
         }
 
-        public void sendSessionModifyRequest(VideoProfile requestProfile) {
-            mProviderHandler.obtainMessage(
-                    MSG_SEND_SESSION_MODIFY_REQUEST, requestProfile).sendToTarget();
+        public void sendSessionModifyRequest(VideoProfile fromProfile, VideoProfile toProfile) {
+            SomeArgs args = SomeArgs.obtain();
+            args.arg1 = fromProfile;
+            args.arg2 = toProfile;
+            mProviderHandler.obtainMessage(MSG_SEND_SESSION_MODIFY_REQUEST, args).sendToTarget();
         }
 
         public void sendSessionModifyResponse(VideoProfile responseProfile) {
@@ -166,7 +179,8 @@ public abstract class ImsVideoCallProvider {
     public abstract void onSetZoom(float value);
 
     /** @see Connection.VideoProvider#onSendSessionModifyRequest */
-    public abstract void onSendSessionModifyRequest(VideoProfile requestProfile);
+    public abstract void onSendSessionModifyRequest(VideoProfile fromProfile,
+            VideoProfile toProfile);
 
     /** @see Connection.VideoProvider#onSendSessionModifyResponse */
     public abstract void onSendSessionModifyResponse(VideoProfile responseProfile);
diff --git a/src/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java b/src/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java
index 36fb131a..df1b314c 100644
--- a/src/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java
+++ b/src/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java
@@ -213,9 +213,9 @@ public class ImsVideoCallProviderWrapper extends Connection.VideoProvider {
     }
 
     /** @inheritDoc */
-    public void onSendSessionModifyRequest(VideoProfile requestProfile) {
+    public void onSendSessionModifyRequest(VideoProfile fromProfile, VideoProfile toProfile) {
         try {
-            mVideoCallProvider.sendSessionModifyRequest(requestProfile);
+            mVideoCallProvider.sendSessionModifyRequest(fromProfile, toProfile);
         } catch (RemoteException e) {
         }
     }