am 6cbd7a8f: am 979cf8e4: Merge "camera2: Don\'t NPE when closing the CameraDevice" into klp-dev

* commit '6cbd7a8f4fd921ea1b0ad3d1da0580b384a1855e': camera2: Don't NPE when closing the CameraDevice
2013-09-03 17:53:46 -07:00
parent c80531ae5f 6cbd7a8f4f
commit afb0317fa0
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) {