am 3914e4b7: Remove LocationManager#getLastKnownLocation(Criteria).

* commit '3914e4b7d12b014f73085cd6e34b6fd69ea26226':
  Remove LocationManager#getLastKnownLocation(Criteria).

api/current.txt

@@ -10598,7 +10598,6 @@ package android.location {
     method public deprecated java.lang.String getBestProvider(android.location.Criteria, boolean);
     method public android.location.GpsStatus getGpsStatus(android.location.GpsStatus);
     method public deprecated android.location.Location getLastKnownLocation(java.lang.String);
-    method public deprecated android.location.Location getLastKnownLocation(android.location.Criteria);
     method public android.location.Location getLastLocation(android.location.LocationRequest);
     method public deprecated android.location.LocationProvider getProvider(java.lang.String);
     method public deprecated java.util.List<java.lang.String> getProviders(boolean);

location/java/android/location/LocationManager.java

@@ -1243,36 +1243,6 @@ public class LocationManager {
         }
     }
 
-    /**
-     * Return the last know Location that satisfies the given
-     * criteria. This can be done without starting the provider.
-     * Note that this location could
-     * be out-of-date, for example if the device was turned off and
-     * moved to another location.
-     *
-     * <p> If no location is found that satisfies the criteria, null is returned
-     *
-     * @param criteria location criteria
-     * @return the last known location that satisfies criteria, or null
-     *
-     * @throws SecurityException if no suitable permission is present
-     * @throws IllegalArgumentException if criteria is null
-     * @deprecated use the {@link LocationRequest} class instead
-     */
-    @Deprecated
-    public Location getLastKnownLocation(Criteria criteria) {
-        checkCriteria(criteria);
-
-        LocationRequest request = LocationRequest.createFromDeprecatedCriteria(
-                criteria, 0, 0, true);
-        try {
-            return mService.getLastLocation(request);
-        } catch (RemoteException e) {
-            Log.e(TAG, "RemoteException", e);
-            return null;
-        }
-    }
-
     // Mock provider support
 
     /**