diff options
| author | Angus Kong <shkong@google.com> | 2013-04-01 09:55:24 -0700 |
|---|---|---|
| committer | Angus Kong <shkong@google.com> | 2013-04-01 09:55:24 -0700 |
| commit | 918f811c21eb5a325626bf523a390926d4e6cb77 (patch) | |
| tree | 138101a7d51b082b954f54b4110d37da8e239473 /src | |
| parent | 8034eec63a1d84450d1841844a9294a10d14ba6d (diff) | |
| download | android_packages_apps_Snap-918f811c21eb5a325626bf523a390926d4e6cb77.tar.gz android_packages_apps_Snap-918f811c21eb5a325626bf523a390926d4e6cb77.tar.bz2 android_packages_apps_Snap-918f811c21eb5a325626bf523a390926d4e6cb77.zip | |
Fix NPE when reconnecting camera.
bug:8513852
Change-Id: I45150e5519604f695d25c830262c8b6eb363b1d3
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraManager.java b/src/com/android/camera/CameraManager.java index 65b2bb83a..e89c2eb81 100644 --- a/src/com/android/camera/CameraManager.java +++ b/src/com/android/camera/CameraManager.java @@ -334,7 +334,7 @@ public class CameraManager { holder = mReconnectExceptionQueue.take(); } catch (InterruptedException ex) { } - if (holder == null || holder.ex != null) { + if (holder != null && holder.ex != null) { throw holder.ex; } } |