diff options
| author | Chung-yih Wang <cywang@google.com> | 2011-10-18 13:15:33 +0800 |
|---|---|---|
| committer | Chung-yih Wang <cywang@google.com> | 2011-10-18 13:15:33 +0800 |
| commit | 24db47192bfa37ac77b0be474b3ad9d8c0366e78 (patch) | |
| tree | 8cf8545e80867feb0f38d0f5f4fbefaac793329d /src/com/android/camera/Camera.java | |
| parent | 52c5c76bddbf3994867a00d0e266b390592486aa (diff) | |
| download | LegacyCamera-24db47192bfa37ac77b0be474b3ad9d8c0366e78.zip LegacyCamera-24db47192bfa37ac77b0be474b3ad9d8c0366e78.tar.gz LegacyCamera-24db47192bfa37ac77b0be474b3ad9d8c0366e78.tar.bz2 | |
Fix the NPE in onPause().
bug:5474906
We changed the order of onCreate. mLocationManager can be null if the
app fails to open the camera.
Change-Id: I31d3af5717ee320b6fb108db7f6c129355b366d9
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 8cc5816..bae4ff0 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(); |