Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e73f12ff authored by Etan Cohen's avatar Etan Cohen Committed by Android (Google) Code Review
Browse files

Merge changes I620d8e72,I532ca35c 

* changes:
  [RTT2] System API for a Responder Configuration
  [RTT2] Baseline public Wi-Fi RTT API
parents fe3cc4b9 2892ba66

api/current.txt

+51 −0
Original line number Diff line number Diff line
@@ -9340,6 +9340,7 @@ package android.content { 
    field public static final java.lang.String WALLPAPER_SERVICE = "wallpaper";

    field public static final java.lang.String WIFI_AWARE_SERVICE = "wifiaware";

    field public static final java.lang.String WIFI_P2P_SERVICE = "wifip2p";

    field public static final java.lang.String WIFI_RTT_RANGING_SERVICE = "wifirtt";

    field public static final java.lang.String WIFI_SERVICE = "wifi";

    field public static final java.lang.String WINDOW_SERVICE = "window";

  }
@@ -11122,6 +11123,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_WIFI_AWARE = "android.hardware.wifi.aware";

    field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct";

    field public static final java.lang.String FEATURE_WIFI_PASSPOINT = "android.hardware.wifi.passpoint";

    field public static final java.lang.String FEATURE_WIFI_RTT = "android.hardware.wifi.rtt";

    field public static final int GET_ACTIVITIES = 1; // 0x1

    field public static final int GET_CONFIGURATIONS = 16384; // 0x4000

    field public static final deprecated int GET_DISABLED_COMPONENTS = 512; // 0x200
@@ -27788,6 +27790,55 @@ package android.net.wifi.p2p.nsd { 














}



























package android.net.wifi.rtt {

























  public final class RangingRequest implements android.os.Parcelable {













    method public int describeContents();













    method public static int getMaxPeers();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.net.wifi.rtt.RangingRequest> CREATOR;













  }

























  public static final class RangingRequest.Builder {













    ctor public RangingRequest.Builder();













    method public android.net.wifi.rtt.RangingRequest.Builder addAccessPoint(android.net.wifi.ScanResult);













    method public android.net.wifi.rtt.RangingRequest.Builder addAccessPoints(java.util.List<android.net.wifi.ScanResult>);













    method public android.net.wifi.rtt.RangingRequest.Builder addWifiAwarePeer(android.net.MacAddress);













    method public android.net.wifi.rtt.RangingRequest.Builder addWifiAwarePeer(android.net.wifi.aware.PeerHandle);













    method public android.net.wifi.rtt.RangingRequest build();













  }

























  public final class RangingResult implements android.os.Parcelable {













    method public int describeContents();













    method public int getDistanceMm();













    method public int getDistanceStdDevMm();













    method public android.net.MacAddress getMacAddress();













    method public android.net.wifi.aware.PeerHandle getPeerHandle();













    method public long getRangingTimestampUs();













    method public int getRssi();













    method public int getStatus();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.net.wifi.rtt.RangingResult> CREATOR;













    field public static final int STATUS_FAIL = 1; // 0x1













    field public static final int STATUS_SUCCESS = 0; // 0x0













  }

























  public abstract class RangingResultCallback {













    ctor public RangingResultCallback();













    method public abstract void onRangingFailure(int);













    method public abstract void onRangingResults(java.util.List<android.net.wifi.rtt.RangingResult>);













    field public static final int STATUS_CODE_FAIL = 1; // 0x1













    field public static final int STATUS_CODE_FAIL_RTT_NOT_AVAILABLE = 2; // 0x2













  }

























  public class WifiRttManager {













    method public boolean isAvailable();













    method public void startRanging(android.net.wifi.rtt.RangingRequest, android.net.wifi.rtt.RangingResultCallback, android.os.Handler);













    field public static final java.lang.String ACTION_WIFI_RTT_STATE_CHANGED = "android.net.wifi.rtt.action.WIFI_RTT_STATE_CHANGED";













  }

























}



























package android.nfc {





























  public class FormatException extends java.lang.Exception {

























api/system-current.txt



+46
−0




























Original line number
Diff line number
Diff line








@@ -3257,6 +3257,52 @@ package android.net.wifi.aware {





























}





























package android.net.wifi.rtt {



























  public static final class RangingRequest.Builder {













    method public android.net.wifi.rtt.RangingRequest.Builder addResponder(android.net.wifi.rtt.ResponderConfig);













  }



























  public final class ResponderConfig implements android.os.Parcelable {













    ctor public ResponderConfig(android.net.MacAddress, int, boolean, int, int, int, int, int);













    ctor public ResponderConfig(android.net.wifi.aware.PeerHandle, int, boolean, int, int, int, int, int);













    method public int describeContents();













    method public static android.net.wifi.rtt.ResponderConfig fromScanResult(android.net.wifi.ScanResult);













    method public static android.net.wifi.rtt.ResponderConfig fromWifiAwarePeerHandleWithDefaults(android.net.wifi.aware.PeerHandle);













    method public static android.net.wifi.rtt.ResponderConfig fromWifiAwarePeerMacAddressWithDefaults(android.net.MacAddress);













    method public void writeToParcel(android.os.Parcel, int);













    field public static final int CHANNEL_WIDTH_160MHZ = 3; // 0x3













    field public static final int CHANNEL_WIDTH_20MHZ = 0; // 0x0













    field public static final int CHANNEL_WIDTH_40MHZ = 1; // 0x1













    field public static final int CHANNEL_WIDTH_80MHZ = 2; // 0x2













    field public static final int CHANNEL_WIDTH_80MHZ_PLUS_MHZ = 4; // 0x4













    field public static final android.os.Parcelable.Creator<android.net.wifi.rtt.ResponderConfig> CREATOR;













    field public static final int PREAMBLE_HT = 1; // 0x1













    field public static final int PREAMBLE_LEGACY = 0; // 0x0













    field public static final int PREAMBLE_VHT = 2; // 0x2













    field public static final int RESPONDER_AP = 0; // 0x0













    field public static final int RESPONDER_AWARE = 4; // 0x4













    field public static final int RESPONDER_P2P_CLIENT = 3; // 0x3













    field public static final int RESPONDER_P2P_GO = 2; // 0x2













    field public static final int RESPONDER_STA = 1; // 0x1













    field public final int centerFreq0;













    field public final int centerFreq1;













    field public final int channelWidth;













    field public final int frequency;













    field public final android.net.MacAddress macAddress;













    field public final android.net.wifi.aware.PeerHandle peerHandle;













    field public final int preamble;













    field public final int responderType;













    field public final boolean supports80211mc;













  }



























  public class WifiRttManager {













    method public void cancelRanging(android.os.WorkSource);













    method public void startRanging(android.os.WorkSource, android.net.wifi.rtt.RangingRequest, android.net.wifi.rtt.RangingResultCallback, android.os.Handler);













  }



























}





























package android.nfc {































  public final class NfcAdapter {

































core/java/android/content/Context.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -3530,7 +3530,6 @@ public abstract class Context {













     *















     * @see #getSystemService















     * @see android.net.wifi.rtt.WifiRttManager













     * @hide















     */















    public static final String WIFI_RTT_RANGING_SERVICE = "wifirtt";

















































core/java/android/content/pm/PackageManager.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -2327,8 +2327,6 @@ public abstract class PackageManager {













    /**















     * Feature for {@link #getSystemAvailableFeatures} and















     * {@link #hasSystemFeature}: The device supports Wi-Fi RTT (IEEE 802.11mc).













     *













     * @hide RTT_API















     */















    @SdkConstant(SdkConstantType.FEATURE)















    public static final String FEATURE_WIFI_RTT = "android.hardware.wifi.rtt";

































wifi/java/android/net/wifi/rtt/RangingRequest.java



+4
−4




























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@













package android.net.wifi.rtt;































import android.annotation.NonNull;













import android.annotation.SystemApi;















import android.net.MacAddress;















import android.net.wifi.ScanResult;















import android.net.wifi.aware.AttachCallback;









@@ -41,8 +42,6 @@ import java.util.StringJoiner;













 * The ranging request is a batch request - specifying a set of devices (specified using















 * {@link RangingRequest.Builder#addAccessPoint(ScanResult)} and















 * {@link RangingRequest.Builder#addAccessPoints(List)}).













 *













 * @hide RTT_API















 */















public final class RangingRequest implements Parcelable {















    private static final int MAX_PEERS = 10;










@@ -198,7 +197,7 @@ public final class RangingRequest implements Parcelable {













            return addResponder(ResponderConfig.fromWifiAwarePeerHandleWithDefaults(peerHandle));















        }





























        /*













        /**















         * Add the Responder device specified by the {@link ResponderConfig} to the list of devices















         * with which to measure range. The total number of peers added to the request cannot exceed















         * the limit specified by {@link #getMaxPeers()}.









@@ -206,8 +205,9 @@ public final class RangingRequest implements Parcelable {













         * @param responder Information on the RTT Responder.















         * @return The builder, to facilitate chaining {@code builder.setXXX(..).setXXX(..)}.















         *













         * @hide (SystemApi)













         * @hide















         */













        @SystemApi















        public Builder addResponder(@NonNull ResponderConfig responder) {















            if (responder == null) {















                throw new IllegalArgumentException("Null Responder!");