diff options
| author | Doris Liu <tianliu@google.com> | 2013-03-06 11:22:48 -0800 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2013-03-06 11:23:29 -0800 |
| commit | 5b45e26674bcbb91bdc195bed15a897ba3b96b0e (patch) | |
| tree | 96d7028df846991d710dc9d37dbd25e93edb2ba4 /src/com/android/camera/ui | |
| parent | 3aff80f9b0e4507b0f0775b581b4518a01e34da0 (diff) | |
| download | android_packages_apps_Snap-5b45e26674bcbb91bdc195bed15a897ba3b96b0e.tar.gz android_packages_apps_Snap-5b45e26674bcbb91bdc195bed15a897ba3b96b0e.tar.bz2 android_packages_apps_Snap-5b45e26674bcbb91bdc195bed15a897ba3b96b0e.zip | |
Fix NPE in switcher popup
Bug: 8327966
Change-Id: I4181a59871c065435756c100b3e8b43930781ee5
Diffstat (limited to 'src/com/android/camera/ui')
| -rw-r--r-- | src/com/android/camera/ui/CameraSwitcher.java | 4 |
1 files 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; |