Merge "[RTT] Public LCI and LCR API" (9c0a08b7) · Commits · e / os / android_frameworks_base

api/current.txt

+25 −0

Original line number	Diff line number	Diff line
		@@ -27940,6 +27940,29 @@ package android.net.wifi.p2p.nsd {

		package android.net.wifi.rtt {

		public final class LocationCivic implements android.os.Parcelable {
		method public int describeContents();
		method public byte[] getData();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.net.wifi.rtt.LocationCivic> CREATOR;
		}

		public final class LocationConfigurationInformation implements android.os.Parcelable {
		method public int describeContents();
		method public double getAltitude();
		method public int getAltitudeType();
		method public double getAltitudeUncertainty();
		method public double getLatitude();
		method public double getLatitudeUncertainty();
		method public double getLongitude();
		method public double getLongitudeUncertainty();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final int ALTITUDE_IN_FLOORS = 2; // 0x2
		field public static final int ALTITUDE_IN_METERS = 1; // 0x1
		field public static final int ALTITUDE_UNKNOWN = 0; // 0x0
		field public static final android.os.Parcelable.Creator<android.net.wifi.rtt.LocationConfigurationInformation> CREATOR;
		}

		public final class RangingRequest implements android.os.Parcelable {
		method public int describeContents();
		method public static int getMaxPeers();
		@@ -27963,6 +27986,8 @@ package android.net.wifi.rtt {
		method public android.net.MacAddress getMacAddress();
		method public android.net.wifi.aware.PeerHandle getPeerHandle();
		method public long getRangingTimestampUs();
		method public android.net.wifi.rtt.LocationCivic getReportedLocationCivic();
		method public android.net.wifi.rtt.LocationConfigurationInformation getReportedLocationConfigurationInformation();
		method public int getRssi();
		method public int getStatus();
		method public void writeToParcel(android.os.Parcel, int);

wifi/java/android/net/wifi/rtt/LocationCivic.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -32,8 +32,6 @@ import java.util.Objects;
		* returns an instance of this class) it is possibly Self Reported (by the peer). In such a case
		* the information is NOT validated - use with caution. Consider validating it with other sources
		* of information before using it.
		*
		* @hide
		*/
		public final class LocationCivic implements Parcelable {
		private final byte[] mData;
		@@ -77,7 +75,6 @@ public final class LocationCivic implements Parcelable {
		dest.writeByteArray(mData);
		}

		/** @hide */
		public static final Parcelable.Creator<LocationCivic> CREATOR =
		new Parcelable.Creator<LocationCivic>() {
		@Override

wifi/java/android/net/wifi/rtt/LocationConfigurationInformation.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -36,8 +36,6 @@ import java.util.Objects;
		* returns an instance of this class) it is possibly Self Reported (by the peer). In such a case
		* the information is NOT validated - use with caution. Consider validating it with other sources
		* of information before using it.
		*
		* @hide PLANNED_API
		*/
		public final class LocationConfigurationInformation implements Parcelable {
		/** @hide */
		@@ -214,7 +212,6 @@ public final class LocationConfigurationInformation implements Parcelable {
		dest.writeDouble(mAltitudeUncertainty);
		}

		/** @hide */
		public static final Creator<LocationConfigurationInformation> CREATOR =
		new Creator<LocationConfigurationInformation>() {
		@Override

wifi/java/android/net/wifi/rtt/RangingResult.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -181,8 +181,6 @@ public final class RangingResult implements Parcelable {
		* <p>
		* Note: the information is NOT validated - use with caution. Consider validating it with
		* other sources of information before using it.
		*
		* @hide PLANNED_API
		*/
		@Nullable
		public LocationConfigurationInformation getReportedLocationConfigurationInformation() {
		@@ -199,8 +197,6 @@ public final class RangingResult implements Parcelable {
		* <p>
		* Note: the information is NOT validated - use with caution. Consider validating it with
		* other sources of information before using it.
		*
		* @hide PLANNED_API
		*/
		@Nullable
		public LocationCivic getReportedLocationCivic() {