commit 807de8aa763a5ba459ab87b6e0b61c3a025c1ebe
author Tyler Gunn <tgunn@google.com> Mon Jun 30 14:22:57 2014 -0700
committer Tyler Gunn <tgunn@google.com> Mon Jun 30 21:26:05 2014 +0000
tree ac1654b993997a5f2d81c665d32a33ad4c880eab
parent cef139470df02fbe4e9464a54b8e09f29bc99cd9

Fixing crash in phone app due to missing null checks pertaining to
CallVideoProvider.

Change-Id: Ifd5a558a2b36e0cb656c9a57f64ae0744425a3ef

telecomm/java/android/telecomm/InCallCall.java

diff --git a/telecomm/java/android/telecomm/InCallCall.java b/telecomm/java/android/telecomm/InCallCall.java
index 2a77547..cf31cec5 100644
--- a/telecomm/java/android/telecomm/InCallCall.java
+++ b/telecomm/java/android/telecomm/InCallCall.java
@@ -159,7 +159,7 @@
      * @return The call video provider.
      */
     public RemoteCallVideoProvider getCallVideoProvider() throws RemoteException {
-        if (mRemoteCallVideoProvider == null) {
+        if (mRemoteCallVideoProvider == null && mCallVideoProvider != null) {
             try {
                 mRemoteCallVideoProvider = new RemoteCallVideoProvider(mCallVideoProvider);
             } catch (RemoteException ignored) {
@@ -244,7 +244,8 @@
         destination.writeParcelable(mSubscription, 0);
         destination.writeParcelable(mCurrentCallServiceDescriptor, 0);
         destination.writeParcelable(mHandoffCallServiceDescriptor, 0);
-        destination.writeStrongBinder(mCallVideoProvider.asBinder());
+        destination.writeStrongBinder(
+                mCallVideoProvider != null ? mCallVideoProvider.asBinder() : null);
         destination.writeString(mParentCallId);
         destination.writeList(mChildCallIds);
     }

telecomm/java/android/telecomm/RemoteCallVideoProvider.java

diff --git a/telecomm/java/android/telecomm/RemoteCallVideoProvider.java b/telecomm/java/android/telecomm/RemoteCallVideoProvider.java
index 7b86db0..872085a 100644
--- a/telecomm/java/android/telecomm/RemoteCallVideoProvider.java
+++ b/telecomm/java/android/telecomm/RemoteCallVideoProvider.java
@@ -42,5 +42,5 @@
      */
     public void setCamera(String cameraId) throws RemoteException {
         mCallVideoProvider.setCamera(cameraId);
-    };
-}
\ No newline at end of file
+    }
+}