From 8a57efb7eb627c20bc43a8007a95652247720118 Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Tue, 22 Jul 2014 12:09:38 -0700
Subject: [PATCH] Don't throw RemoteException in public RemoteCallVideoClient
 APIs.

- Hide constructor.
- No longer implements IBinder.DeathRecipient.
- Catch RemoteExceptions instead of throwing RemoteExceptions.

Change-Id: Iaa049cab9e24120d3ea732e1ede78cc6fcd0ad71
---
 api/current.txt                                    | 15 +++--
 .../android/telecomm/RemoteCallVideoClient.java    | 66 ++++++++++++++--------
 2 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 37008e43dd68..a407abc707e4 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28706,14 +28706,13 @@ package android.telecomm {
     field public static final android.os.Parcelable.Creator CREATOR;
   }
 
-  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 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 RemoteCallVideoProvider {
diff --git a/telecomm/java/android/telecomm/RemoteCallVideoClient.java b/telecomm/java/android/telecomm/RemoteCallVideoClient.java
index 80248318b7ff..08d1391fc689 100644
--- a/telecomm/java/android/telecomm/RemoteCallVideoClient.java
+++ b/telecomm/java/android/telecomm/RemoteCallVideoClient.java
@@ -26,17 +26,20 @@ import com.android.internal.telecomm.ICallVideoClient;
 /**
  * Remote class to invoke callbacks in InCallUI related to supporting video in calls.
  */
-public class RemoteCallVideoClient implements IBinder.DeathRecipient {
+public class RemoteCallVideoClient {
     private final ICallVideoClient mCallVideoClient;
 
+    private IBinder.DeathRecipient mDeathRecipient = new IBinder.DeathRecipient() {
+        @Override
+        public void binderDied() {
+            mCallVideoClient.asBinder().unlinkToDeath(this, 0);
+        }
+    };
+
+    /** {@hide} */
     RemoteCallVideoClient(ICallVideoClient callVideoProvider) throws RemoteException {
         mCallVideoClient = callVideoProvider;
-        mCallVideoClient.asBinder().linkToDeath(this, 0);
-    }
-
-    @Override
-    public void binderDied() {
-        mCallVideoClient.asBinder().unlinkToDeath(this, 0);
+        mCallVideoClient.asBinder().linkToDeath(mDeathRecipient, 0);
     }
 
     /**
@@ -49,9 +52,11 @@ public class RemoteCallVideoClient implements IBinder.DeathRecipient {
      *
      * @param videoCallProfile The requested video call profile.
      */
-    public void receiveSessionModifyRequest(VideoCallProfile videoCallProfile)
-            throws RemoteException {
-        mCallVideoClient.receiveSessionModifyRequest(videoCallProfile);
+    public void receiveSessionModifyRequest(VideoCallProfile videoCallProfile) {
+        try {
+            mCallVideoClient.receiveSessionModifyRequest(videoCallProfile);
+        } catch (RemoteException e) {
+        }
     }
 
     /**
@@ -66,9 +71,13 @@ public class RemoteCallVideoClient implements IBinder.DeathRecipient {
      * @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) throws RemoteException {
-        mCallVideoClient.receiveSessionModifyResponse(status, requestedProfile, responseProfile);
+    public void receiveSessionModifyResponse(
+            int status, VideoCallProfile requestedProfile, VideoCallProfile responseProfile) {
+        try {
+            mCallVideoClient.receiveSessionModifyResponse(
+                    status, requestedProfile, responseProfile);
+        } catch (RemoteException e) {
+        }
     }
 
     /**
@@ -81,8 +90,11 @@ public class RemoteCallVideoClient implements IBinder.DeathRecipient {
      *
      * @param event The event.
      */
-    public void handleCallSessionEvent(int event) throws RemoteException {
-        mCallVideoClient.handleCallSessionEvent(event);
+    public void handleCallSessionEvent(int event) {
+        try {
+            mCallVideoClient.handleCallSessionEvent(event);
+        } catch (RemoteException e) {
+        }
     }
 
     /**
@@ -92,8 +104,11 @@ public class RemoteCallVideoClient implements IBinder.DeathRecipient {
      * @param width  The updated peer video width.
      * @param height The updated peer video height.
      */
-    public void updatePeerDimensions(int width, int height) throws RemoteException {
-        mCallVideoClient.updatePeerDimensions(width, height);
+    public void updatePeerDimensions(int width, int height) {
+        try {
+            mCallVideoClient.updatePeerDimensions(width, height);
+        } catch (RemoteException e) {
+        }
     }
 
     /**
@@ -101,8 +116,11 @@ public class RemoteCallVideoClient implements IBinder.DeathRecipient {
      *
      * @param dataUsage The updated data usage.
      */
-    public void updateCallDataUsage(int dataUsage) throws RemoteException {
-        mCallVideoClient.updateCallDataUsage(dataUsage);
+    public void updateCallDataUsage(int dataUsage) {
+        try {
+            mCallVideoClient.updateCallDataUsage(dataUsage);
+        } catch (RemoteException e) {
+        }
     }
 
     /**
@@ -110,8 +128,10 @@ public class RemoteCallVideoClient implements IBinder.DeathRecipient {
      *
      * @param callCameraCapabilities The changed camera capabilities.
      */
-    public void handleCameraCapabilitiesChange(CallCameraCapabilities callCameraCapabilities)
-            throws RemoteException {
-        mCallVideoClient.handleCameraCapabilitiesChange(callCameraCapabilities);
+    public void handleCameraCapabilitiesChange(CallCameraCapabilities callCameraCapabilities) {
+        try {
+            mCallVideoClient.handleCameraCapabilitiesChange(callCameraCapabilities);
+        } catch (RemoteException e) {
+        }
     }
-}
+}
\ No newline at end of file
-- 
2.11.0