diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-01-07 01:32:37 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-07 01:32:37 -0800 |
| commit | e22208b001bbdeabc60565438eb2bcac3a67e00b (patch) | |
| tree | 4358a508c05641162900d8a1af350a0afeb71ae6 /src/com | |
| parent | 300be7c5bf8796c015a95365cad03e0ef11b1595 (diff) | |
| parent | c9031f88a0b9ed898c5ef652d16b577594a83642 (diff) | |
| download | android_packages_apps_Snap-e22208b001bbdeabc60565438eb2bcac3a67e00b.tar.gz android_packages_apps_Snap-e22208b001bbdeabc60565438eb2bcac3a67e00b.tar.bz2 android_packages_apps_Snap-e22208b001bbdeabc60565438eb2bcac3a67e00b.zip | |
Merge "SnapdragonCamera: Do not prompt remember location pop up twice."
Diffstat (limited to 'src/com')
| -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 32cd5dcf7..b0ad0ae20 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -606,7 +606,7 @@ public class PhotoModule return; } Log.v(TAG, "onPreviewUIReady"); - if (mCameraState == PREVIEW_STOPPED || mCameraState == INIT) { + if (mCameraState == PREVIEW_STOPPED) { startPreview(); } else { SurfaceHolder sh = mUI.getSurfaceHolder(); |