diff options
| author | Spike Sprague <spikuru@google.com> | 2014-09-24 01:03:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-24 01:03:23 +0000 |
| commit | c89420a6c2e44b17a7dcc556f9a633db58ba4ab5 (patch) | |
| tree | ed96e395b11c7558cea6ef710f92a1c75e24aefe | |
| parent | 1db7f2860a5117ad2082802f9e3ce7c0314bfee8 (diff) | |
| parent | 7d1fb593ae26e4f327e47bcbb857057da4ea23a0 (diff) | |
| download | android_packages_apps_Camera2-c89420a6c2e44b17a7dcc556f9a633db58ba4ab5.tar.gz android_packages_apps_Camera2-c89420a6c2e44b17a7dcc556f9a633db58ba4ab5.tar.bz2 android_packages_apps_Camera2-c89420a6c2e44b17a7dcc556f9a633db58ba4ab5.zip | |
am 7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier
* commit '7d1fb593ae26e4f327e47bcbb857057da4ea23a0':
monkey test NPE fix, another null check on mCameraDevice
| -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 |