diff options
| author | Michael Kolb <kolby@google.com> | 2013-03-22 14:11:57 -0700 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2013-03-22 14:11:57 -0700 |
| commit | 955e5c57ec592003abea8e6b8f0bc2bfb3e201bc (patch) | |
| tree | 565657f3b49704b4a4b5d82c80f9703353898b5c /src | |
| parent | e3974bb4614d027e88ad915f70c4c05fb5ff76b1 (diff) | |
| download | android_packages_apps_Snap-955e5c57ec592003abea8e6b8f0bc2bfb3e201bc.tar.gz android_packages_apps_Snap-955e5c57ec592003abea8e6b8f0bc2bfb3e201bc.tar.bz2 android_packages_apps_Snap-955e5c57ec592003abea8e6b8f0bc2bfb3e201bc.zip | |
Fix NPE in Camera
Bug: 8409508
Change-Id: I962a7eccec9ca2e1c190eb1c2c252020cd0926e0
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 24c49ba8a..3813cce34 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -370,8 +370,12 @@ public class CameraActivity extends ActivityBase } private void unbindMediaSaveService() { - mMediaSaveService.setListener(null); - unbindService(mConnection); + if (mMediaSaveService != null) { + mMediaSaveService.setListener(null); + } + if (mConnection != null) { + unbindService(mConnection); + } } @Override |