diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-12-15 12:10:29 +0800 |
|---|---|---|
| committer | Hung-ying Tyan <tyanh@google.com> | 2010-12-15 12:47:18 +0800 |
| commit | 0f405feacb2fa89d22e9fd8cb982cffad14af4a3 (patch) | |
| tree | b44fcfb77aaa27a83504112a0c7de6b40eee85ed | |
| parent | f8a6539e688b0926cc98a88a93d47d094ded7d7a (diff) | |
| download | LegacyCamera-0f405feacb2fa89d22e9fd8cb982cffad14af4a3.zip LegacyCamera-0f405feacb2fa89d22e9fd8cb982cffad14af4a3.tar.gz LegacyCamera-0f405feacb2fa89d22e9fd8cb982cffad14af4a3.tar.bz2 | |
Fix a NPE in Camera when zoom is changed
as the activity is paused.
Bug: 3285827
Change-Id: Ib5de58a66586d34226111d1197053801f08e6f8e
| -rw-r--r-- | src/com/android/camera/Camera.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 42dee8a..ac74ddc 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -471,6 +471,9 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, } private void onZoomValueChanged(int index) { + // Not useful to change zoom value when the activity is paused. + if (mPausing) return; + if (mSmoothZoomSupported) { if (mTargetZoomValue != index && mZoomState != ZOOM_STOPPED) { mTargetZoomValue = index; |