commit e55c9686a180cc81e8aac1eeadad12271d8e41ca
author David Christie <dnchrist@google.com> Thu Aug 22 10:10:34 2013 -0700
committer David Christie <dnchrist@google.com> Thu Aug 22 10:10:34 2013 -0700
tree 6fd0d63b16d174dd4526c88bc142c78f568aa0a7
parent 435e7dfd922510bbc081800d0c6092ea52ed9cd1

Ensure WorkSource for location blaming has names (b/10378815)

Change-Id: Ic201f7112dd9c746fe71995fcc1a533ff4a582f2

services/java/com/android/server/LocationManagerService.java

diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index 9761441..95c768f 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -1235,8 +1235,11 @@
                     if (UserHandle.getUserId(record.mReceiver.mUid) == mCurrentUserId) {
                         LocationRequest locationRequest = record.mRequest;
                         if (locationRequest.getInterval() <= thresholdInterval) {
-                            if (record.mReceiver.mWorkSource != null) {
+                            if (record.mReceiver.mWorkSource != null
+                                    && record.mReceiver.mWorkSource.size() > 0
+                                    && record.mReceiver.mWorkSource.getName(0) != null) {
                                 // Assign blame to another work source.
+                                // Can only assign blame if the WorkSource contains names.
                                 worksource.add(record.mReceiver.mWorkSource);
                             } else {
                                 // Assign blame to caller.