diff options
| author | Senpo Hu <senpo@google.com> | 2014-10-14 19:07:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-14 19:07:06 +0000 |
| commit | 7a3ce60cfe7f5a554ab8edeb08c203196b17b164 (patch) | |
| tree | 7682288e4155083525fc027e3bcd655e923a84a8 /src | |
| parent | 4ed861a70de7db31a7d4b9227b523bef684d7eed (diff) | |
| parent | 9746ebec86df2f276ee18eeaf070ff0fc4ad06ec (diff) | |
| download | android_packages_apps_Camera2-7a3ce60cfe7f5a554ab8edeb08c203196b17b164.tar.gz android_packages_apps_Camera2-7a3ce60cfe7f5a554ab8edeb08c203196b17b164.tar.bz2 android_packages_apps_Camera2-7a3ce60cfe7f5a554ab8edeb08c203196b17b164.zip | |
Merge "Prevent NullPointerException of PhotoModule in quick resume-pause." into ub-camera-glacier
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 8c1c88c8a..b729aa987 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -313,6 +313,10 @@ public class PhotoModule } private void checkDisplayRotation() { + // Need to just be a no-op for the quick resume-pause scenario. + if (mPaused) { + return; + } // Set the display orientation if display rotation has changed. // Sometimes this happens when the device is held upside // down and camera app is opened. Rotation animation will |