From 2f3ee9a159b84fd9638c385ab840dd3bf22f3778 Mon Sep 17 00:00:00 2001 From: Tyler Trephan Date: Thu, 21 Mar 2019 10:54:22 -0700 Subject: [PATCH] Fixed "adb shell dumpsys location" NullPointerException. If dumpsys is called before systemRunning(), then NullPointerException is thrown because of null member variables. Test: Tested on Hawk. Fix: 128919170 Change-Id: I66097d94443bb18fa87e2f00c44901c772a1b851 --- .../com/android/server/LocationManagerService.java | 24 ++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java index b89223b5cbda..f0244c303360 100644 --- a/services/core/java/com/android/server/LocationManagerService.java +++ b/services/core/java/com/android/server/LocationManagerService.java @@ -3597,10 +3597,18 @@ public class LocationManagerService extends ILocationManager.Stub { pw.println(" " + provider + ": " + location); } - mGeofenceManager.dump(pw); - - pw.append(" "); - mBlacklist.dump(pw); + if (mGeofenceManager != null) { + mGeofenceManager.dump(pw); + } else { + pw.println(" Geofences: null"); + } + + if (mBlacklist != null) { + pw.append(" "); + mBlacklist.dump(pw); + } else { + pw.println(" mBlacklist=null"); + } if (mLocationControllerExtraPackage != null) { pw.println(" Location controller extra package: " + mLocationControllerExtraPackage @@ -3614,8 +3622,12 @@ public class LocationManagerService extends ILocationManager.Stub { } } - pw.append(" fudger: "); - mLocationFudger.dump(fd, pw, args); + if (mLocationFudger != null) { + pw.append(" fudger: "); + mLocationFudger.dump(fd, pw, args); + } else { + pw.println(" fudger: null"); + } if (args.length > 0 && "short".equals(args[0])) { return; -- 2.11.0