diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2009-07-30 22:15:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-30 22:15:21 -0700 |
| commit | c8c50ad248c400ae8dcbf83572aea07a601cee3e (patch) | |
| tree | e845dc3f56015f1fe3fb5a23757ed888d4d9f8ea /src | |
| parent | 0200f87cc7dcc377e88ebc34cabdc1d41401ebf7 (diff) | |
| parent | 048e9db023de286e9576b438d4c616a53773abc8 (diff) | |
| download | packages_apps_LegacyCamera-c8c50ad248c400ae8dcbf83572aea07a601cee3e.zip packages_apps_LegacyCamera-c8c50ad248c400ae8dcbf83572aea07a601cee3e.tar.gz packages_apps_LegacyCamera-c8c50ad248c400ae8dcbf83572aea07a601cee3e.tar.bz2 | |
am 048e9db0: Fix 2021864: NPE while saving picture in CropImage.
Merge commit '048e9db023de286e9576b438d4c616a53773abc8'
* commit '048e9db023de286e9576b438d4c616a53773abc8':
Fix 2021864: NPE while saving picture in CropImage.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CropImage.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/CropImage.java b/src/com/android/camera/CropImage.java index 6b45cc5..53c5f7c 100644 --- a/src/com/android/camera/CropImage.java +++ b/src/com/android/camera/CropImage.java @@ -398,7 +398,9 @@ public class CropImage extends MonitoredActivity { @Override protected void onDestroy() { - mAllImages.deactivate(); + if (mAllImages != null) { + mAllImages.deactivate(); + } super.onDestroy(); } |