From 8892e5e7ffa1f33b527b7753b07723dfd685a9cd Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Wed, 6 Mar 2013 11:22:48 -0800
Subject: [PATCH] Fix NPE in switcher popup

Bug: 8327966
Change-Id: I4181a59871c065435756c100b3e8b43930781ee5
---
 src/com/android/camera/ui/CameraSwitcher.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/camera/ui/CameraSwitcher.java b/src/com/android/camera/ui/CameraSwitcher.java
index 897729b46..326416a97 100644
--- a/src/com/android/camera/ui/CameraSwitcher.java
+++ b/src/com/android/camera/ui/CameraSwitcher.java
@@ -140,7 +140,7 @@ public class CameraSwitcher extends RotateImageView
             item.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    onCameraSelected(index);
+                    if (showsPopup()) onCameraSelected(index);
                 }
             });
             switch (mDrawIds[i]) {
@@ -271,7 +271,7 @@ public class CameraSwitcher extends RotateImageView
                 @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;
-- 
2.11.0