am 9bb90c3b: am 2049ccfd: Fix NPE in phone UI.

* commit '9bb90c3b940421a60251d2fb94b586461c544d5d':
  Fix NPE in phone UI.

2 files changed, 3 insertions, 10 deletions

diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index c4ff965..010099e 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -492,8 +492,7 @@ public class VideoCamera extends ActivityBase
         if (mIsVideoCaptureIntent) {
             mPreferenceGroup = filterPreferenceScreenByIntent(mPreferenceGroup);
         }
-        mHeadUpDisplay.initialize(this, mPreferenceGroup,
-                mOrientationCompensation, mCaptureTimeLapse);
+        mHeadUpDisplay.initialize(this, mPreferenceGroup, mOrientationCompensation);
     }
 
     private void attachHeadUpDisplay() {
diff --git a/src/com/android/camera/ui/CamcorderHeadUpDisplay.java b/src/com/android/camera/ui/CamcorderHeadUpDisplay.java
index 09236c8..6d4ef55 100644
--- a/src/com/android/camera/ui/CamcorderHeadUpDisplay.java
+++ b/src/com/android/camera/ui/CamcorderHeadUpDisplay.java
@@ -34,10 +34,8 @@ public class CamcorderHeadUpDisplay extends HeadUpDisplay {
         super(context);
     }
 
-    public void initialize(Context context, PreferenceGroup group,
-                           int initialOrientation, boolean captureTimeLapse) {
+    public void initialize(Context context, PreferenceGroup group, int initialOrientation) {
         mInitialOrientation = initialOrientation;
-        mCaptureTimeLapse = captureTimeLapse;
         super.initialize(context, group);
     }
 
@@ -66,11 +64,7 @@ public class CamcorderHeadUpDisplay extends HeadUpDisplay {
 
         addIndicator(context, group, CameraSettings.KEY_WHITE_BALANCE);
         addIndicator(context, group, CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE);
-        if (mCaptureTimeLapse) {
-            addIndicator(context, group, CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL);
-        } else {
-            addIndicator(context, group, CameraSettings.KEY_VIDEO_QUALITY);
-        }
+        addIndicator(context, group, CameraSettings.KEY_VIDEO_QUALITY);
         addIndicator(context, group, CameraSettings.KEY_CAMERA_ID);
 
         mIndicatorBar.setOrientation(mInitialOrientation);