commit ea78b85bb7b688a513fcf456f0e1aeee11e106ea
author Victoria Lease <violets@google.com> Tue Jan 15 10:39:28 2013 -0800
committer Victoria Lease <violets@google.com> Tue Jan 15 10:39:28 2013 -0800
tree a76f630e795b99dc3a448c35a8e01814ee2381ea
parent 8217635056efa9fb285bd4a0eb26a1789c5cd557

fix NPE in updateClientUids

Bug: 8009908
Change-Id: I54d97c587a3fa9d003f654f98fdfdbe21af791d6

services/java/com/android/server/location/GpsLocationProvider.java

diff --git a/services/java/com/android/server/location/GpsLocationProvider.java b/services/java/com/android/server/location/GpsLocationProvider.java
index 0c54d5a..12c14bf 100644
--- a/services/java/com/android/server/location/GpsLocationProvider.java
+++ b/services/java/com/android/server/location/GpsLocationProvider.java
@@ -858,6 +858,9 @@
     private void updateClientUids(WorkSource source) {
         // Update work source.
         WorkSource[] changes = mClientSource.setReturningDiffs(source);
+        if (changes == null) {
+            return;
+        }
         WorkSource newWork = changes[0];
         WorkSource goneWork = changes[1];