diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-08-10 15:27:06 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-08-10 15:27:06 -0700 |
| commit | 4e29ce0aecfb7ad1bbf0cd42ff8077a3989c6b04 (patch) | |
| tree | 5105ed4e5e85af41bad47a3267567b04d8364056 /src | |
| parent | 98705d996df7e7fa80e066f679adea0adc175d0c (diff) | |
| parent | 57192594aaf4d2d4ec62b2bb3ebbca63e691aca1 (diff) | |
| download | android_packages_apps_Snap-4e29ce0aecfb7ad1bbf0cd42ff8077a3989c6b04.tar.gz android_packages_apps_Snap-4e29ce0aecfb7ad1bbf0cd42ff8077a3989c6b04.tar.bz2 android_packages_apps_Snap-4e29ce0aecfb7ad1bbf0cd42ff8077a3989c6b04.zip | |
Merge "SnapDragon: Changes to create UI object before openCamera."
Diffstat (limited to 'src')
| -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 54787bd2b..8517d2294 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -493,11 +493,11 @@ public class PhotoModule mPreferences.setLocalId(mActivity, mCameraId); CameraSettings.upgradeLocalPreferences(mPreferences.getLocal()); + mUI = new PhotoUI(activity, this, parent); if (mOpenCameraThread == null) { 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); |