summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tyler Gunn <tgunn@google.com> 2017-02-08 21:56:39 +0000
committer android-build-merger <android-build-merger@google.com> 2017-02-08 21:56:39 +0000
commite55b11573e804f7fd18885b0107c0e9fb1841718 (patch)
tree417a2f5690ca623c37c6c052ca79074922c862f2
parent65eef762a9d8878552925e2c2964a18340583b44 (diff)
parentc164b159f8d8c31587468581dd43250a9b91649f (diff)
Merge "Change prototype for "setCamera" in IMS VideoProvider."
am: c164b159f8 Change-Id: I3abbb1de951f65c226a6849f34946880e9f650ff
-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);