Fix a couple of bugs from the location overhaul.

Marshall LocationRequest array correctly.

Observe reportLocation from FusionEngine.

Actually deliver the setRequest message to fusion engine.

Change-Id: Iff64596fdd42f9fb06e563591dda9fbe0241533a

2 files changed, 4 insertions, 4 deletions

diff --git a/packages/FusedLocation/src/com/android/location/fused/FusedLocationProvider.java b/packages/FusedLocation/src/com/android/location/fused/FusedLocationProvider.java
index 45f05f3..7918882 100644
--- a/packages/FusedLocation/src/com/android/location/fused/FusedLocationProvider.java
+++ b/packages/FusedLocation/src/com/android/location/fused/FusedLocationProvider.java
@@ -78,7 +78,7 @@ public class FusedLocationProvider extends LocationProviderBase implements Fusio
                 case MSG_SET_REQUEST:
                     {
                         RequestWrapper wrapper = (RequestWrapper) msg.obj;
-                        mEngine.setRequirements(wrapper.request, wrapper.source);
+                        mEngine.setRequest(wrapper.request, wrapper.source);
                         break;
                     }
             }
@@ -97,7 +97,7 @@ public class FusedLocationProvider extends LocationProviderBase implements Fusio
 
     @Override
     public void onSetRequest(ProviderRequestUnbundled request, WorkSource source) {
-        mHandler.obtainMessage(MSG_SET_REQUEST,  new RequestWrapper(request, source));
+        mHandler.obtainMessage(MSG_SET_REQUEST, new RequestWrapper(request, source)).sendToTarget();
     }
 
     @Override
diff --git a/packages/FusedLocation/src/com/android/location/fused/FusionEngine.java b/packages/FusedLocation/src/com/android/location/fused/FusionEngine.java
index f4f87a8..38a6091 100644
--- a/packages/FusedLocation/src/com/android/location/fused/FusionEngine.java
+++ b/packages/FusedLocation/src/com/android/location/fused/FusionEngine.java
@@ -120,9 +120,9 @@ public class FusionEngine implements LocationListener {
     }
 
     /** Called on mLooper thread */
-    public void setRequirements(ProviderRequestUnbundled request, WorkSource source) {
+    public void setRequest(ProviderRequestUnbundled request, WorkSource source) {
         mRequest = request;
-        mEnabled = true;
+        mEnabled = request.getReportLocation();
         updateRequirements();
     }