Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fecd6d49 authored by David Christie's avatar David Christie Committed by Android (Google) Code Review
Browse files

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

parents 96d1b01d e55c9686

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

+4 −1
Original line number Diff line number Diff line
@@ -1235,8 +1235,11 @@ public class LocationManagerService extends ILocationManager.Stub { 
                    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.