commit 2f8b097ea1c25a614ce6c1c4b1ae960938634f8f
author Victoria Lease <violets@google.com> Tue Jan 15 13:48:01 2013 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 15 13:48:29 2013 -0800
tree 84538b3102bddea027f45f129e51a7608c066840
parent be33f9696a1194d9f927fb4446e07e199a468f9d
parent ea78b85bb7b688a513fcf456f0e1aeee11e106ea

Merge "fix NPE in updateClientUids"

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