diff options
| author | Wei Huang <weih@google.com> | 2011-10-18 06:28:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-18 06:28:09 -0700 |
| commit | e4a29ba9b6e04a0e708d3653ecba927968d8da59 (patch) | |
| tree | b6d7205ad9e5ee9325855972cfd2751b2494cafe /src/com/android/camera/Camera.java | |
| parent | b3548b653b277eabe2214396f2e9dbfe19eb6082 (diff) | |
| parent | 24db47192bfa37ac77b0be474b3ad9d8c0366e78 (diff) | |
| download | packages_apps_LegacyCamera-e4a29ba9b6e04a0e708d3653ecba927968d8da59.tar.gz packages_apps_LegacyCamera-e4a29ba9b6e04a0e708d3653ecba927968d8da59.tar.bz2 packages_apps_LegacyCamera-e4a29ba9b6e04a0e708d3653ecba927968d8da59.zip | |
Merge "Fix the NPE in onPause()." into ics-mr0
Diffstat (limited to 'src/com/android/camera/Camera.java')
| -rw-r--r-- | src/com/android/camera/Camera.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index a66a7642..a0782f88 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -1501,7 +1501,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener, unregisterReceiver(mReceiver); mDidRegister = false; } - mLocationManager.recordLocation(false); + if (mLocationManager != null) mLocationManager.recordLocation(false); updateExposureOnScreenIndicator(0); mFocusManager.releaseSoundPlayer(); |