diff options
| author | Spike Sprague <spikuru@google.com> | 2014-09-22 10:52:32 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2014-09-23 18:06:41 -0700 |
| commit | 6e73222fde5242b424ad712b802f387244da0e53 (patch) | |
| tree | 58108990cc48479b0c22af96f86c939023a96cfe | |
| parent | 7df9f23df802f4322d8602528d8c52d4a1f0e055 (diff) | |
| download | android_packages_apps_Camera2-6e73222fde5242b424ad712b802f387244da0e53.tar.gz android_packages_apps_Camera2-6e73222fde5242b424ad712b802f387244da0e53.tar.bz2 android_packages_apps_Camera2-6e73222fde5242b424ad712b802f387244da0e53.zip | |
monkey test NPE fix, another null check on mCameraDevice
bug: 17604028
Change-Id: I7b45c101045b765562146ebe2c779e227a6227bd
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index ab6afdb2a..8f42014bd 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2321,7 +2321,11 @@ public class PhotoModule updateCameraParametersPreference(); } - mCameraDevice.applySettings(mCameraSettings); + // some monkey tests can get here when shutting the app down + // make sure mCameraDevice is still valid, b/17604028 + if (mCameraDevice != null) { + mCameraDevice.applySettings(mCameraSettings); + } } // If the Camera is idle, update the parameters immediately, otherwise |