summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-06-11 03:51:36 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2014-06-11 03:51:36 -0700
commite8b87bb35f7a6cbe743741be52d89c1393c013f3 (patch)
tree693960ff56a66be91dc3da7c83ff2e7ad9408676 /src
parentefe9bcd651a1bc2f21602a96a11ab5baabe25512 (diff)
parent5e4c2ac386d3cabfc048a28f86e3c61fb99bc5a6 (diff)
downloadandroid_packages_apps_Snap-e8b87bb35f7a6cbe743741be52d89c1393c013f3.tar.gz
android_packages_apps_Snap-e8b87bb35f7a6cbe743741be52d89c1393c013f3.tar.bz2
android_packages_apps_Snap-e8b87bb35f7a6cbe743741be52d89c1393c013f3.zip
Merge "Camera2: Fix flash item status incorrect when turn on/off AE-Bracket"
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 236db5283..2693b54db 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -338,9 +338,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();
}