diff options
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index ffa5601c8..ab6afdb2a 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2110,6 +2110,12 @@ public class PhotoModule } private void updateCameraParametersPreference() { + // some monkey tests can get here when shutting the app down + // make sure mCameraDevice is still valid, b/17580046 + if (mCameraDevice == null) { + return; + } + setAutoExposureLockIfSupported(); setAutoWhiteBalanceLockIfSupported(); setFocusAreasIfSupported(); |