commit 1b338abcb66a7626bcf7906f891054364761399d
author Doris Liu <tianliu@google.com> Wed Mar 06 11:22:48 2013 -0800
committer The Android Automerger <android-build@android.com> Wed Mar 06 15:17:21 2013 -0800
tree 0a0becbe3ec19559f204bdbca1df26f2899cf0d6
parent d776a88aab78eda406c286bad176318b80d11a1d

Fix NPE in switcher popup

Bug: 8327966
Change-Id: I4181a59871c065435756c100b3e8b43930781ee5

src/com/android/camera/ui/CameraSwitcher.java

diff --git a/src/com/android/camera/ui/CameraSwitcher.java b/src/com/android/camera/ui/CameraSwitcher.java
index 897729b..326416a 100644
--- a/src/com/android/camera/ui/CameraSwitcher.java
+++ b/src/com/android/camera/ui/CameraSwitcher.java
@@ -140,7 +140,7 @@
             item.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    onCameraSelected(index);
+                    if (showsPopup()) onCameraSelected(index);
                 }
             });
             switch (mDrawIds[i]) {
@@ -271,7 +271,7 @@
                 @Override
                 public void onAnimationEnd(Animator animation) {
                     // Verify that we weren't canceled
-                    if (!showsPopup()) {
+                    if (!showsPopup() && mPopup != null) {
                         mPopup.setVisibility(View.INVISIBLE);
                         ((ViewGroup) mParent).removeView(mPopup);
                         mPopup = null;