summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tyler Gunn <tgunn@google.com> 2017-02-08 22:01:07 +0000
committer android-build-merger <android-build-merger@google.com> 2017-02-08 22:01:07 +0000
commit998655f80edab71fbe5748c60ce1b791ed92cef1 (patch)
tree39b327a2c55334b00522f0093258979055a9887f
parent6dd6ba628b535d6255e993c5e320f06a3aa32d06 (diff)
parente55b11573e804f7fd18885b0107c0e9fb1841718 (diff)
Merge "Change prototype for "setCamera" in IMS VideoProvider." am: c164b159f8
am: e55b11573e Change-Id: Iffef42c4050bbda451e9cd99cb90589060b105bd
-rw-r--r--telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl b/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl
index 39e83c66b9bb..0da27e163df1 100644
--- a/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl
+++ b/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl
@@ -43,7 +43,7 @@ import com.android.ims.internal.IImsVideoCallCallback;
oneway interface IImsVideoCallProvider {
void setCallback(IImsVideoCallCallback callback);
- void setCamera(String cameraId);
+ void setCamera(String cameraId, int uid);
void setPreviewSurface(in Surface surface);