1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index a368b982e..571a692a4 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -194,6 +194,7 @@ public class CameraActivity extends Activity
      */
     private LocalDataAdapter mDataAdapter;
 
+    private OneCameraManager mCameraManager;
     private SettingsManager mSettingsManager;
     private ModeListView mModeListView;
     private boolean mModeListVisible = false;
@@ -1260,7 +1261,7 @@ public class CameraActivity extends Activity
 
     @Override
     public OneCameraManager getCameraManager() {
-        return OneCameraManager.get(this);
+        return mCameraManager;
     }
 
     private void removeData(int dataID) {
@@ -1331,6 +1332,8 @@ public class CameraActivity extends Activity
         mAppContext = getApplicationContext();
         mSoundPlayer = new SoundPlayer(mAppContext);
 
+        mCameraManager = OneCameraManager.get(this);
+
         // TODO: Try to move all the resources allocation to happen as soon as
         // possible so we can call module.init() at the earliest time.
         mModuleManager = new ModuleManagerImpl();