diff options
| author | kaiyiz <kaiyiz@codeaurora.org> | 2014-09-29 17:11:27 +0800 |
|---|---|---|
| committer | Ethan Chen <intervigil@gmail.com> | 2014-10-24 17:29:21 +0000 |
| commit | 6818971085cba3f6d06b9c9a46f1a7b8b72c691c (patch) | |
| tree | cbdb1d19d5a850247ecb0bd55f5b3782e4ca853f | |
| parent | 6c2b96a7251822c488f8a97bf39b348857851693 (diff) | |
| download | android_packages_apps_Camera2-6818971085cba3f6d06b9c9a46f1a7b8b72c691c.tar.gz android_packages_apps_Camera2-6818971085cba3f6d06b9c9a46f1a7b8b72c691c.tar.bz2 android_packages_apps_Camera2-6818971085cba3f6d06b9c9a46f1a7b8b72c691c.zip | |
Camera2: fix camera has stopped" after long press camera key
When Long press camera key to open camera, mRootView has not
been created in photoModule.init.
mRootView must be created before using it.
CRs-Fixed: 725790
Change-Id: I70cd4ac911c79a15c52d47147414bf1fcee65b53
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 5a66617e4..ca9a4754c 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -495,6 +495,7 @@ public class PhotoModule public void init(CameraActivity activity, View parent) { mActivity = activity; mRootView = parent; + mUI = new PhotoUI(activity, this, parent); mPreferences = new ComboPreferences(mActivity); CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal()); mCameraId = getPreferredCameraId(mPreferences); @@ -523,7 +524,6 @@ public class PhotoModule mOpenCameraThread = new OpenCameraThread(); mOpenCameraThread.start(); } - mUI = new PhotoUI(activity, this, parent); initializeControlByIntent(); mQuickCapture = mActivity.getIntent().getBooleanExtra(EXTRA_QUICK_CAPTURE, false); mLocationManager = new LocationManager(mActivity, mUI); |