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

Commit 88337ac8 authored by Victoria Lease's avatar Victoria Lease Committed by Android Git Automerger
Browse files

am 75819a9c: Merge "Resolve LocationManager + ActivityManager conflict" into jb-mr1.1-dev 

* commit '75819a9c':
  Resolve LocationManager + ActivityManager conflict
parents 1716ecf4 75819a9c

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

+2 −2
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run 
                }

            } else {

                Intent statusChanged = new Intent();

                statusChanged.putExtras(extras);

                statusChanged.putExtras(new Bundle(extras));

                statusChanged.putExtra(LocationManager.KEY_STATUS_CHANGED, status);

                try {

                    synchronized (this) {
@@ -541,7 +541,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run 
                }

            } else {

                Intent locationChanged = new Intent();

                locationChanged.putExtra(LocationManager.KEY_LOCATION_CHANGED, location);

                locationChanged.putExtra(LocationManager.KEY_LOCATION_CHANGED, new Location(location));

                try {

                    synchronized (this) {

                        // synchronize to ensure incrementPendingBroadcastsLocked()