From 0305624f3d992498128f230c549c2a2c479ce4bb Mon Sep 17 00:00:00 2001
From: Eino-Ville Talvala <etalvala@google.com>
Date: Tue, 5 Apr 2016 18:12:11 -0700
Subject: [PATCH] Camera: Null check remote binder interface

For LEGACY mode, there's no remote binder, so need to null check for
that case.

Bug: 28000512
Change-Id: I31035f16fd32875d0bd84ca801927498e86133b3
---
 .../hardware/camera2/impl/ICameraDeviceUserWrapper.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/android/hardware/camera2/impl/ICameraDeviceUserWrapper.java b/core/java/android/hardware/camera2/impl/ICameraDeviceUserWrapper.java
index b2f6c1d4c289f..ef5f6d71b8b6e 100644
--- a/core/java/android/hardware/camera2/impl/ICameraDeviceUserWrapper.java
+++ b/core/java/android/hardware/camera2/impl/ICameraDeviceUserWrapper.java
@@ -55,7 +55,9 @@ public class ICameraDeviceUserWrapper {
     }
 
     public void unlinkToDeath(IBinder.DeathRecipient recipient, int flags) {
-        mRemoteDevice.asBinder().unlinkToDeath(recipient, flags);
+        if (mRemoteDevice.asBinder() != null) {
+            mRemoteDevice.asBinder().unlinkToDeath(recipient, flags);
+        }
     }
 
     public void disconnect()  {