diff options
| author | Igor Murashkin <iam@google.com> | 2013-09-04 00:44:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-04 00:44:31 +0000 |
| commit | 979cf8e461c6790747b2bb6dcc4c0784ca34dbdd (patch) | |
| tree | 46fd3da08987752e439daf2faad86acbf69b646e /core/java/android | |
| parent | 40fbaa79bc31aadefc5dacb314f66b5bcb6d52ae (diff) | |
| parent | 2a3eced15eddc322b946462b9018285997396a99 (diff) | |
Merge "camera2: Don't NPE when closing the CameraDevice" into klp-dev
Diffstat (limited to 'core/java/android')
| -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) { |