diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-05-06 16:01:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-06 16:01:36 +0000 |
| commit | ed7cbf111f5970ab56e557cd785063068405b563 (patch) | |
| tree | 3c3ac596afe3219239c2b03443f524a10d25ef04 /api | |
| parent | 94fb2024b013522e95a880e02b73886fa7d01222 (diff) | |
| parent | 4538216a31d15b01e18c7b504e51031da0ce6e40 (diff) | |
| download | frameworks_base-ed7cbf111f5970ab56e557cd785063068405b563.zip frameworks_base-ed7cbf111f5970ab56e557cd785063068405b563.tar.gz frameworks_base-ed7cbf111f5970ab56e557cd785063068405b563.tar.bz2 | |
Merge "Change sendSessionModifyRequest VideoProvider API signature." into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index a5a1af6..193407e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30446,7 +30446,7 @@ package android.telecom { method public void handleCallSessionEvent(int); method public abstract void onRequestCameraCapabilities(); method public abstract void onRequestConnectionDataUsage(); - method public abstract void onSendSessionModifyRequest(android.telecom.VideoProfile); + method public abstract void onSendSessionModifyRequest(android.telecom.VideoProfile, android.telecom.VideoProfile); method public abstract void onSendSessionModifyResponse(android.telecom.VideoProfile); method public abstract void onSetCamera(java.lang.String); method public abstract void onSetDeviceOrientation(int); diff --git a/api/system-current.txt b/api/system-current.txt index 2248444..2738bdb 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -32567,7 +32567,7 @@ package android.telecom { method public void handleCallSessionEvent(int); method public abstract void onRequestCameraCapabilities(); method public abstract void onRequestConnectionDataUsage(); - method public abstract void onSendSessionModifyRequest(android.telecom.VideoProfile); + method public abstract void onSendSessionModifyRequest(android.telecom.VideoProfile, android.telecom.VideoProfile); method public abstract void onSendSessionModifyResponse(android.telecom.VideoProfile); method public abstract void onSetCamera(java.lang.String); method public abstract void onSetDeviceOrientation(int); |