Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

location: Add some null pointer checks.

Browse Source 
Signed-off-by: Mike Lockwood <lockwood@android.com>
This commit is contained in:
Mike Lockwood
2009-04-21 12:13:35 -07:00
parent 31d40ab260
commit 6de3154674
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/java/com/android/server/LocationManagerService.java
View File

@@ -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;