Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '7595842' into merge2

Browse Source 
Change-Id: I7e11e98e6d59562374195a8761d64a79dc0268e8
This commit is contained in:
Etan Cohen
2015-04-24 13:56:35 -07:00
parent 3b8efc3e74 75958420f2
commit d7b4b81274
8 changed files with 121 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
telecomm/java/android/telecom/VideoCallImpl.java
View File

@@ -166,7 +166,7 @@ public class VideoCallImpl extends VideoCall {
mVideoProvider.asBinder().linkToDeath(mDeathRecipient, 0);
mBinder = new VideoCallListenerBinder();
mVideoProvider.setVideoCallback(mBinder);
mVideoProvider.addVideoCallback(mBinder);
}
/** {@inheritDoc} */
@@ -174,6 +174,15 @@ public class VideoCallImpl extends VideoCall {
mCallback = callback;
}
/** {@inheritDoc} */
public void removeVideoCallListener() {
mVideoCallListener = null;
try {
mVideoProvider.removeVideoCallback(mBinder);
} catch (RemoteException e) {
}
}
/** {@inheritDoc} */
public void setCamera(String cameraId) {
try {