Fixing crash in phone app due to missing null checks pertaining to (807de8aa) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecomm/InCallCall.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -159,7 +159,7 @@ public final class InCallCall implements Parcelable {
		* @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 @@ public final class InCallCall implements Parcelable {
		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);
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -42,5 +42,5 @@ public class RemoteCallVideoProvider implements IBinder.DeathRecipient {
		*/
		public void setCamera(String cameraId) throws RemoteException {
		mCallVideoProvider.setCamera(cameraId);
		};
		}
		}