commit 65ff448549b700e025894ea170d36043d45ecfa6
author Yorke Lee <yorkelee@google.com> Wed May 06 17:01:18 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 06 17:01:19 2015 +0000
tree 71040414d3aed49f9d34c1ae2ad22e5fbfa5b785
parent 0bd4de37ac94b371a1f54891da0fe3df2da8fb6e
parent 4e4ed74f1c29ede44450f78354755bfabfb1fc4f

Merge "Use current userhandle when querying for default dialer" into mnc-dev

testapps/src/com/android/server/telecom/testapps/TestManagedVideoProvider.java

diff --git a/testapps/src/com/android/server/telecom/testapps/TestManagedVideoProvider.java b/testapps/src/com/android/server/telecom/testapps/TestManagedVideoProvider.java
index 68206e4..a78643f 100644
--- a/testapps/src/com/android/server/telecom/testapps/TestManagedVideoProvider.java
+++ b/testapps/src/com/android/server/telecom/testapps/TestManagedVideoProvider.java
@@ -96,8 +96,9 @@
     }
 
     @Override
-    public void onSendSessionModifyRequest(VideoProfile requestProfile) {
-        mRemoteVideoProvider.sendSessionModifyRequest(requestProfile);
+    public void onSendSessionModifyRequest(VideoProfile fromProfile,
+            VideoProfile requestProfile) {
+        mRemoteVideoProvider.sendSessionModifyRequest(fromProfile, requestProfile);
     }
 
     @Override

testapps/src/com/android/server/telecom/testapps/TestVideoProvider.java

diff --git a/testapps/src/com/android/server/telecom/testapps/TestVideoProvider.java b/testapps/src/com/android/server/telecom/testapps/TestVideoProvider.java
index f465243..790ca15 100644
--- a/testapps/src/com/android/server/telecom/testapps/TestVideoProvider.java
+++ b/testapps/src/com/android/server/telecom/testapps/TestVideoProvider.java
@@ -145,7 +145,8 @@
      * the response back via the CallVideoClient.
      */
     @Override
-    public void onSendSessionModifyRequest(final VideoProfile requestProfile) {
+    public void onSendSessionModifyRequest(final VideoProfile fromProfile,
+            final VideoProfile requestProfile) {
         log("Sent session modify request");
 
         mHandler.postDelayed(new Runnable() {