Merge "Camera: Null check remote binder interface" into nyc-dev

2016-04-06 01:19:12 +00:00
parent ca94f29366 0305624f3d
commit 255490c33c
1 changed files with 3 additions and 1 deletions
--- 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()  {