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

Merge "Blame only location observers that actually receive updates" into nyc-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2016-06-10 19:55:28 +00:00
committed by Android (Google) Code Review
parent f4de8dd77c e998c73c33
commit 4e85376fe1
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/LocationManagerService.java
View File

@@ -1431,6 +1431,13 @@ public class LocationManagerService extends ILocationManager.Stub {
for (UpdateRecord record : records) { for (UpdateRecord record : records) {
if (isCurrentProfile(UserHandle.getUserId(record.mReceiver.mUid))) { if (isCurrentProfile(UserHandle.getUserId(record.mReceiver.mUid))) {
LocationRequest locationRequest = record.mRequest; LocationRequest locationRequest = record.mRequest;
// Don't assign battery blame for update records whose
// client has no permission to receive location data.
if (!providerRequest.locationRequests.contains(locationRequest)) {
continue;
}
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.size() > 0