From 6de3154674a268b0e109990a1f4c2742dfdc9c66 Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@android.com>
Date: Tue, 21 Apr 2009 12:13:35 -0700
Subject: [PATCH] location: Add some null pointer checks.

Signed-off-by: Mike Lockwood <lockwood@android.com>
---
 .../android/server/LocationManagerService.java   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index 1204293fe878a..5238c58d990d3 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -1831,8 +1831,12 @@ public class LocationManagerService extends ILocationManager.Stub {
         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 @@ public class LocationManagerService extends ILocationManager.Stub {
     }
 
     private void releaseWakeLockXLocked() {
-        mNetworkLocationProvider.wakeLockReleased();
-        mGpsLocationProvider.wakeLockReleased();
+        if (mNetworkLocationProvider != null) {
+            mNetworkLocationProvider.wakeLockReleased();
+        }
+        if (mGpsLocationProvider != null) {
+            mGpsLocationProvider.wakeLockReleased();
+        }
 
         // Release wake lock
         mWakeLockAcquireTime = 0;