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

Merge "Ensure WorkSource for location blaming has names (b/10378815)" into klp-dev

Browse Source
This commit is contained in:
David Christie
2013-08-22 17:55:26 +00:00
committed by Android (Google) Code Review
parent 96d1b01d2d e55c9686a1
commit fecd6d49e0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1235,8 +1235,11 @@ public class LocationManagerService extends ILocationManager.Stub {
if (UserHandle.getUserId(record.mReceiver.mUid) == mCurrentUserId) { if (UserHandle.getUserId(record.mReceiver.mUid) == mCurrentUserId) {
LocationRequest locationRequest = record.mRequest; LocationRequest locationRequest = record.mRequest;
if (locationRequest.getInterval() <= thresholdInterval) { 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. // Assign blame to another work source.
// Can only assign blame if the WorkSource contains names.
worksource.add(record.mReceiver.mWorkSource); worksource.add(record.mReceiver.mWorkSource);
} else { } else {
// Assign blame to caller. // Assign blame to caller.