Merge "camera2: Don't NPE when closing the CameraDevice" into klp-dev

2013-09-04 00:44:31 +00:00
parent 40fbaa79bc 2a3eced15e
commit 979cf8e461
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/hardware/camera2/impl/CameraDevice.java
+++ b/core/java/android/hardware/camera2/impl/CameraDevice.java
@@ -301,7 +301,9 @@ public class CameraDevice implements android.hardware.camera2.CameraDevice {
        synchronized (mLock) {

            try {
-                mRemoteDevice.disconnect();
+                if (mRemoteDevice != null) {
+                    mRemoteDevice.disconnect();
+                }
            } catch (CameraRuntimeException e) {
                throw e.asChecked();
            } catch (RemoteException e) {