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

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

Browse Source 
* commit '88337ac8c0ada1f3baef25cf9d4d9d85b2a8459e':
  Resolve LocationManager + ActivityManager conflict
This commit is contained in:
Victoria Lease
2012-11-14 13:22:51 -08:00
committed by Android Git Automerger
parent 8578c51771 88337ac8c0
commit c8b912aa9f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -506,7 +506,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
} }
} else { } else {
Intent statusChanged = new Intent(); Intent statusChanged = new Intent();
statusChanged.putExtras(extras); statusChanged.putExtras(new Bundle(extras));
statusChanged.putExtra(LocationManager.KEY_STATUS_CHANGED, status); statusChanged.putExtra(LocationManager.KEY_STATUS_CHANGED, status);
try { try {
synchronized (this) { synchronized (this) {
@@ -541,7 +541,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
} }
} else { } else {
Intent locationChanged = new Intent(); Intent locationChanged = new Intent();
locationChanged.putExtra(LocationManager.KEY_LOCATION_CHANGED, location); locationChanged.putExtra(LocationManager.KEY_LOCATION_CHANGED, new Location(location));
try { try {
synchronized (this) { synchronized (this) {
// synchronize to ensure incrementPendingBroadcastsLocked() // synchronize to ensure incrementPendingBroadcastsLocked()