diff options
| author | Angus Kong <shkong@google.com> | 2013-04-01 18:06:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-01 18:06:06 +0000 |
| commit | e5a79a5bd8ca3e25c14e4fe5df7c1ee1b544dc7e (patch) | |
| tree | 6c3189225c3d5996aac32a7e473e67135d2e5e46 /src | |
| parent | 46252663f34021bf93586234396ce1139ae5d02e (diff) | |
| parent | 918f811c21eb5a325626bf523a390926d4e6cb77 (diff) | |
| download | android_packages_apps_Snap-e5a79a5bd8ca3e25c14e4fe5df7c1ee1b544dc7e.tar.gz android_packages_apps_Snap-e5a79a5bd8ca3e25c14e4fe5df7c1ee1b544dc7e.tar.bz2 android_packages_apps_Snap-e5a79a5bd8ca3e25c14e4fe5df7c1ee1b544dc7e.zip | |
Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce
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; } } |