Merge "Prevent NullPointerException of PhotoModule in quick resume-pause." into ub-camera-glacier
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 8c1c88c..b729aa9 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -313,6 +313,10 @@
}
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