Fix NPE in monkey tests.

bug:6555094
bug:6555247

Change-Id: I69f25d6f3973e2d1c0dc78d3f785a1fd80b68d93

1 files changed, 5 insertions, 4 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 7a6511db..25ef3f7b 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -279,6 +279,8 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
                 mHandler.sendEmptyMessage(CAMERA_OPEN_DONE);
                 startPreview();
                 mHandler.sendEmptyMessage(START_PREVIEW_DONE);
+                mOnResumeTime = SystemClock.uptimeMillis();
+                mHandler.sendEmptyMessage(CHECK_DISPLAY_ROTATION);
             } catch (CameraHardwareException e) {
                 mHandler.sendEmptyMessage(OPEN_CAMERA_FAIL);
             } catch (CameraDisabledException e) {
@@ -1559,9 +1561,6 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
         }
         keepScreenOnAwhile();
 
-        mOnResumeTime = SystemClock.uptimeMillis();
-        mHandler.sendEmptyMessageDelayed(CHECK_DISPLAY_ROTATION, 100);
-
         // Dismiss open menu if exists.
         PopupManager.getInstance(this).notifyShowPopup(null);
 
@@ -2181,7 +2180,9 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
             Util.fadeOut((View) mReviewDoneButton);
 
             Util.fadeIn(mShutterButton);
-            Util.fadeIn(mIndicatorControlContainer);
+            if (mIndicatorControlContainer != null) {
+                Util.fadeIn(mIndicatorControlContainer);
+            }
         }
     }