summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorkaiyiz <kaiyiz@codeaurora.org>2014-06-06 16:10:05 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-06-06 01:11:25 -0700
commit5e4c2ac386d3cabfc048a28f86e3c61fb99bc5a6 (patch)
tree2a70676d886a3e9447561c87827f6187de033649 /src
parentae531060071669eb4fcb10f04420f941bc04115c (diff)
downloadandroid_packages_apps_Snap-5e4c2ac386d3cabfc048a28f86e3c61fb99bc5a6.tar.gz
android_packages_apps_Snap-5e4c2ac386d3cabfc048a28f86e3c61fb99bc5a6.tar.bz2
android_packages_apps_Snap-5e4c2ac386d3cabfc048a28f86e3c61fb99bc5a6.zip
Camera2: Fix flash item status incorrect when turn on/off AE-Bracket
The popup should not be set null when the popup is showing, which will lead to the view(popup) could not be update by application. Example: when turn on/off AE-Bracket could not disable flash item after popup is set null Don't set popup null when the popup is showing. [Reference similar code in VideoMenu] CRs-Fixed: 674423 Change-Id: Id8c5772f3504014ee6591cc16dddcacbf5325629
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PhotoMenu.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index a9526962b..805b3e921 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -339,9 +339,6 @@ public class PhotoMenu extends PieController
mUI.showPopup(mPopup2);
else if (popupNum == 3)
mUI.showPopup(mPopup3);
- if(mPopup1 != null) mPopup1 = null;
- if(mPopup2 != null) mPopup2 = null;
- if(mPopup3 != null) mPopup3 = null;
} else {
initializePopup();
}