diff options
| author | 2013-08-28 17:35:10 -0700 | |
|---|---|---|
| committer | 2013-08-28 17:38:39 -0700 | |
| commit | 2a3eced15eddc322b946462b9018285997396a99 (patch) | |
| tree | dcb3ee27282b3c6415124547abb084f5c381446c | |
| parent | bbbc8660cdbfb033291f1911742a942a42c85af0 (diff) | |
camera2: Don't NPE when closing the CameraDevice
Bug: 10360518
Change-Id: I0154e12490a063adea753c0aa6ae422605ba5ac5
| -rw-r--r-- | core/java/android/hardware/camera2/impl/CameraDevice.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/impl/CameraDevice.java b/core/java/android/hardware/camera2/impl/CameraDevice.java index 64e4dc92dcef..86a073f9fa37 100644 --- 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) { |