commit 2a3eced15eddc322b946462b9018285997396a99
author Igor Murashkin <iam@google.com> Wed Aug 28 17:35:10 2013 -0700
committer Igor Murashkin <iam@google.com> Wed Aug 28 17:38:39 2013 -0700
tree dcb3ee27282b3c6415124547abb084f5c381446c
parent bbbc8660cdbfb033291f1911742a942a42c85af0

camera2: Don't NPE when closing the CameraDevice

Bug: 10360518
Change-Id: I0154e12490a063adea753c0aa6ae422605ba5ac5

core/java/android/hardware/camera2/impl/CameraDevice.java

diff --git a/core/java/android/hardware/camera2/impl/CameraDevice.java b/core/java/android/hardware/camera2/impl/CameraDevice.java
index 64e4dc9..86a073f 100644
--- a/core/java/android/hardware/camera2/impl/CameraDevice.java
+++ b/core/java/android/hardware/camera2/impl/CameraDevice.java
@@ -301,7 +301,9 @@
         synchronized (mLock) {
 
             try {
-                mRemoteDevice.disconnect();
+                if (mRemoteDevice != null) {
+                    mRemoteDevice.disconnect();
+                }
             } catch (CameraRuntimeException e) {
                 throw e.asChecked();
             } catch (RemoteException e) {