commit ad805f2cad2d846790252eed337c638bf4a8c0d8
author Wei Huang <weih@google.com> Tue Oct 18 06:30:30 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 18 06:30:30 2011 -0700
tree f8f94405f13f2d3c9fdf4cf4021f617b99583c31
parent 2532dba74a0de4558e1cb22bee1d636d95ff1d08
parent e4a29ba9b6e04a0e708d3653ecba927968d8da59

am e4a29ba9: Merge "Fix the NPE in onPause()." into ics-mr0

* commit 'e4a29ba9b6e04a0e708d3653ecba927968d8da59':
  Fix the NPE in onPause().

src/com/android/camera/Camera.java

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 6460383..6c238a6 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1498,7 +1498,7 @@
             unregisterReceiver(mReceiver);
             mDidRegister = false;
         }
-        mLocationManager.recordLocation(false);
+        if (mLocationManager != null) mLocationManager.recordLocation(false);
         updateExposureOnScreenIndicator(0);
 
         mFocusManager.releaseSoundPlayer();