Merge "Revert "Don't throw RemoteException in public RemoteCallVideoClient APIs."" into lmp-dev (921ec805) · Commits · e / os / android_frameworks_base

api/current.txt

+8 −7

Original line number	Diff line number	Diff line
		@@ -28706,13 +28706,14 @@ package android.telecomm {
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public class RemoteCallVideoClient {
		method public void handleCallSessionEvent(int);
		method public void handleCameraCapabilitiesChange(android.telecomm.CallCameraCapabilities);
		method public void receiveSessionModifyRequest(android.telecomm.VideoCallProfile);
		method public void receiveSessionModifyResponse(int, android.telecomm.VideoCallProfile, android.telecomm.VideoCallProfile);
		method public void updateCallDataUsage(int);
		method public void updatePeerDimensions(int, int);
		public class RemoteCallVideoClient implements android.os.IBinder.DeathRecipient {
		method public void binderDied();
		method public void handleCallSessionEvent(int) throws android.os.RemoteException;
		method public void handleCameraCapabilitiesChange(android.telecomm.CallCameraCapabilities) throws android.os.RemoteException;
		method public void receiveSessionModifyRequest(android.telecomm.VideoCallProfile) throws android.os.RemoteException;
		method public void receiveSessionModifyResponse(int, android.telecomm.VideoCallProfile, android.telecomm.VideoCallProfile) throws android.os.RemoteException;
		method public void updateCallDataUsage(int) throws android.os.RemoteException;
		method public void updatePeerDimensions(int, int) throws android.os.RemoteException;
		}

		public class RemoteCallVideoProvider {

telecomm/java/android/telecomm/RemoteCallVideoClient.java

+23 −43

Original line number	Diff line number	Diff line
		@@ -26,21 +26,18 @@ import com.android.internal.telecomm.ICallVideoClient;
		/**
		* Remote class to invoke callbacks in InCallUI related to supporting video in calls.
		*/
		public class RemoteCallVideoClient {
		public class RemoteCallVideoClient implements IBinder.DeathRecipient {
		private final ICallVideoClient mCallVideoClient;

		private IBinder.DeathRecipient mDeathRecipient = new IBinder.DeathRecipient() {
		RemoteCallVideoClient(ICallVideoClient callVideoProvider) throws RemoteException {
		mCallVideoClient = callVideoProvider;
		mCallVideoClient.asBinder().linkToDeath(this, 0);
		}

		@Override
		public void binderDied() {
		mCallVideoClient.asBinder().unlinkToDeath(this, 0);
		}
		};

		/** {@hide} */
		RemoteCallVideoClient(ICallVideoClient callVideoProvider) throws RemoteException {
		mCallVideoClient = callVideoProvider;
		mCallVideoClient.asBinder().linkToDeath(mDeathRecipient, 0);
		}

		/**
		* Called when a session modification request is received from the remote device.
		@@ -52,11 +49,9 @@ public class RemoteCallVideoClient {
		*
		* @param videoCallProfile The requested video call profile.
		*/
		public void receiveSessionModifyRequest(VideoCallProfile videoCallProfile) {
		try {
		public void receiveSessionModifyRequest(VideoCallProfile videoCallProfile)
		throws RemoteException {
		mCallVideoClient.receiveSessionModifyRequest(videoCallProfile);
		} catch (RemoteException e) {
		}
		}

		/**
		@@ -71,13 +66,9 @@ public class RemoteCallVideoClient {
		* @param requestedProfile The original request which was sent to the remote device.
		* @param responseProfile The actual profile changes made by the remote device.
		*/
		public void receiveSessionModifyResponse(
		int status, VideoCallProfile requestedProfile, VideoCallProfile responseProfile) {
		try {
		mCallVideoClient.receiveSessionModifyResponse(
		status, requestedProfile, responseProfile);
		} catch (RemoteException e) {
		}
		public void receiveSessionModifyResponse(int status, VideoCallProfile requestedProfile,
		VideoCallProfile responseProfile) throws RemoteException {
		mCallVideoClient.receiveSessionModifyResponse(status, requestedProfile, responseProfile);
		}

		/**
		@@ -90,11 +81,8 @@ public class RemoteCallVideoClient {
		*
		* @param event The event.
		*/
		public void handleCallSessionEvent(int event) {
		try {
		public void handleCallSessionEvent(int event) throws RemoteException {
		mCallVideoClient.handleCallSessionEvent(event);
		} catch (RemoteException e) {
		}
		}

		/**
		@@ -104,11 +92,8 @@ public class RemoteCallVideoClient {
		* @param width The updated peer video width.
		* @param height The updated peer video height.
		*/
		public void updatePeerDimensions(int width, int height) {
		try {
		public void updatePeerDimensions(int width, int height) throws RemoteException {
		mCallVideoClient.updatePeerDimensions(width, height);
		} catch (RemoteException e) {
		}
		}

		/**
		@@ -116,11 +101,8 @@ public class RemoteCallVideoClient {
		*
		* @param dataUsage The updated data usage.
		*/
		public void updateCallDataUsage(int dataUsage) {
		try {
		public void updateCallDataUsage(int dataUsage) throws RemoteException {
		mCallVideoClient.updateCallDataUsage(dataUsage);
		} catch (RemoteException e) {
		}
		}

		/**
		@@ -128,10 +110,8 @@ public class RemoteCallVideoClient {
		*
		* @param callCameraCapabilities The changed camera capabilities.
		*/
		public void handleCameraCapabilitiesChange(CallCameraCapabilities callCameraCapabilities) {
		try {
		public void handleCameraCapabilitiesChange(CallCameraCapabilities callCameraCapabilities)
		throws RemoteException {
		mCallVideoClient.handleCameraCapabilitiesChange(callCameraCapabilities);
		} catch (RemoteException e) {
		}
		}
		}