commit 6de3154674a268b0e109990a1f4c2742dfdc9c66
author Mike Lockwood <lockwood@android.com> Tue Apr 21 12:13:35 2009 -0700
committer Mike Lockwood <lockwood@android.com> Tue Apr 21 12:13:35 2009 -0700
tree 3250edcf85033305a6924482775db0e5334e5ea1
parent 31d40ab260bbf8b73a50dea29995192579a11947

location: Add some null pointer checks.

Signed-off-by: Mike Lockwood <lockwood@android.com>

services/java/com/android/server/LocationManagerService.java

diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index 1204293..5238c58 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -1831,8 +1831,12 @@
         mWakeLockAcquireTime = SystemClock.elapsedRealtime();
         log("Acquired wakelock");
 
-        mNetworkLocationProvider.wakeLockAcquired();
-        mGpsLocationProvider.wakeLockAcquired();
+        if (mNetworkLocationProvider != null) {
+            mNetworkLocationProvider.wakeLockAcquired();
+        }
+        if (mGpsLocationProvider != null) {
+            mGpsLocationProvider.wakeLockAcquired();
+        }
     }
 
     private void releaseWakeLockLocked() {
@@ -1846,8 +1850,12 @@
     }
 
     private void releaseWakeLockXLocked() {
-        mNetworkLocationProvider.wakeLockReleased();
-        mGpsLocationProvider.wakeLockReleased();
+        if (mNetworkLocationProvider != null) {
+            mNetworkLocationProvider.wakeLockReleased();
+        }
+        if (mGpsLocationProvider != null) {
+            mGpsLocationProvider.wakeLockReleased();
+        }
 
         // Release wake lock
         mWakeLockAcquireTime = 0;