diff options
| author | Spike Sprague <spikuru@google.com> | 2014-09-19 11:18:46 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2014-09-19 11:56:00 -0700 |
| commit | a0697c5b879f48ad009192028b34578eae42f394 (patch) | |
| tree | 7a0c105dd8a3e4b337e7205a13c8c1171f3703ce | |
| parent | bdba0dc07cc6a0a0ba08aeb5903b7b00b6cfc1ef (diff) | |
| download | android_packages_apps_Camera2-a0697c5b879f48ad009192028b34578eae42f394.tar.gz android_packages_apps_Camera2-a0697c5b879f48ad009192028b34578eae42f394.tar.bz2 android_packages_apps_Camera2-a0697c5b879f48ad009192028b34578eae42f394.zip | |
add null check to updateCameraParametersPreferences to apease the monkey
bug: 17580046
Change-Id: I4a109c1134684f6d5b2dafdb138137ef36f208f0
| -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(); |