Merge "API REVIEW: Undeprecate Location.dump() Bug #7173109" into jb-mr1-dev

Author: Romain Guy

api/current.txt

@@ -10655,7 +10655,7 @@ package android.location {
     method public int describeContents();
     method public static void distanceBetween(double, double, double, double, float[]);
     method public float distanceTo(android.location.Location);
-    method public deprecated void dump(android.util.Printer, java.lang.String);
+    method public void dump(android.util.Printer, java.lang.String);
     method public float getAccuracy();
     method public double getAltitude();
     method public float getBearing();

location/java/android/location/Location.java

@@ -83,7 +83,7 @@ public class Location implements Parcelable {
     private float mDistance = 0.0f;
     private float mInitialBearing = 0.0f;
     // Scratchpad
-    private float[] mResults = new float[2];
+    private final float[] mResults = new float[2];
 
     /**
      * Construct a new Location with a named provider.
@@ -839,10 +839,6 @@ public String toString() {
         return s.toString();
     }
 
-    /**
-     * @deprecated Use {@link #toString} instead
-     */
-    @Deprecated
     public void dump(Printer pw, String prefix) {
         pw.println(prefix + toString());
     }