2 files changed, 6 insertions, 4 deletions
diff --git a/location/java/android/location/ILocationManager.aidl b/location/java/android/location/ILocationManager.aidl
index a2ce606..f663e0a 100644
--- a/location/java/android/location/ILocationManager.aidl
+++ b/location/java/android/location/ILocationManager.aidl
@@ -45,7 +45,7 @@ interface ILocationManager
             in PendingIntent intent, String packageName);
     void removeGeofence(in Geofence fence, in PendingIntent intent, String packageName);
 
-    Location getLastLocation(in LocationRequest request);
+    Location getLastLocation(in LocationRequest request, String packageName);
 
     boolean addGpsStatusListener(IGpsStatusListener listener);
     void removeGpsStatusListener(IGpsStatusListener listener);
diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java
index 25da208..bef363b 100644
--- a/location/java/android/location/LocationManager.java
+++ b/location/java/android/location/LocationManager.java
@@ -1174,8 +1174,10 @@ public class LocationManager {
      * @throws SecurityException if no suitable permission is present
      */
     public Location getLastLocation() {
+        String packageName = mContext.getPackageName();
+
         try {
-            return mService.getLastLocation(null);
+            return mService.getLastLocation(null, packageName);
         } catch (RemoteException e) {
             Log.e(TAG, "RemoteException", e);
             return null;
@@ -1204,12 +1206,12 @@ public class LocationManager {
     @Deprecated
     public Location getLastKnownLocation(String provider) {
         checkProvider(provider);
-
+        String packageName = mContext.getPackageName();
         LocationRequest request = LocationRequest.createFromDeprecatedProvider(
                 provider, 0, 0, true);
 
         try {
-            return mService.getLastLocation(request);
+            return mService.getLastLocation(request, packageName);
         } catch (RemoteException e) {
             Log.e(TAG, "RemoteException", e);
             return null;