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

Commit d0acccdf authored by Etan Cohen's avatar Etan Cohen
Browse files

[RTT] Deprecate legacy RTT API 

Bug: 65108579
Test: unit tests pass
Test: WifiRttManagerTest:test_regular_scan_then_rtt_ranging_stress
Change-Id: Ifa90acf8bb358657785b42222e68c537658c85e2
parent 9accbba1

api/system-current.txt

+11 −11
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ package android.content { 
    field public static final java.lang.String STATS_MANAGER = "stats";

    field public static final java.lang.String SYSTEM_UPDATE_SERVICE = "system_update";

    field public static final java.lang.String VR_SERVICE = "vrmanager";

    field public static final java.lang.String WIFI_RTT_SERVICE = "rttmanager";

    field public static final deprecated java.lang.String WIFI_RTT_SERVICE = "rttmanager";

    field public static final java.lang.String WIFI_SCANNING_SERVICE = "wifiscanner";

  }
@@ -3091,7 +3091,7 @@ package android.net.http { 


package android.net.wifi {



  public class RttManager {

  public deprecated class RttManager {

    method public void disableResponder(android.net.wifi.RttManager.ResponderCallback);

    method public void enableResponder(android.net.wifi.RttManager.ResponderCallback);

    method public deprecated android.net.wifi.RttManager.Capabilities getCapabilities();
@@ -3167,22 +3167,22 @@ package android.net.wifi { 
    field public int supportedType;

  }



  public static class RttManager.ParcelableRttParams implements android.os.Parcelable {

  public static deprecated class RttManager.ParcelableRttParams implements android.os.Parcelable {

    field public android.net.wifi.RttManager.RttParams[] mParams;

  }



  public static class RttManager.ParcelableRttResults implements android.os.Parcelable {

  public static deprecated class RttManager.ParcelableRttResults implements android.os.Parcelable {

    ctor public RttManager.ParcelableRttResults(android.net.wifi.RttManager.RttResult[]);

    field public android.net.wifi.RttManager.RttResult[] mResults;

  }



  public static abstract class RttManager.ResponderCallback {

  public static abstract deprecated class RttManager.ResponderCallback {

    ctor public RttManager.ResponderCallback();

    method public abstract void onResponderEnableFailure(int);

    method public abstract void onResponderEnabled(android.net.wifi.RttManager.ResponderConfig);

  }



  public static class RttManager.ResponderConfig implements android.os.Parcelable {

  public static deprecated class RttManager.ResponderConfig implements android.os.Parcelable {

    ctor public RttManager.ResponderConfig();

    method public int describeContents();

    method public void writeToParcel(android.os.Parcel, int);
@@ -3195,7 +3195,7 @@ package android.net.wifi { 
    field public int preamble;

  }



  public static class RttManager.RttCapabilities implements android.os.Parcelable {

  public static deprecated class RttManager.RttCapabilities implements android.os.Parcelable {

    ctor public RttManager.RttCapabilities();

    field public int bwSupported;

    field public boolean lciSupported;
@@ -3210,13 +3210,13 @@ package android.net.wifi { 
    field public boolean twoSided11McRttSupported;

  }



  public static abstract interface RttManager.RttListener {

  public static abstract deprecated interface RttManager.RttListener {

    method public abstract void onAborted();

    method public abstract void onFailure(int, java.lang.String);

    method public abstract void onSuccess(android.net.wifi.RttManager.RttResult[]);

  }



  public static class RttManager.RttParams {

  public static deprecated class RttManager.RttParams {

    ctor public RttManager.RttParams();

    field public boolean LCIRequest;

    field public boolean LCRRequest;
@@ -3240,7 +3240,7 @@ package android.net.wifi { 
    field public boolean secure;

  }



  public static class RttManager.RttResult {

  public static deprecated class RttManager.RttResult {

    ctor public RttManager.RttResult();

    field public android.net.wifi.RttManager.WifiInformationElement LCI;

    field public android.net.wifi.RttManager.WifiInformationElement LCR;
@@ -3277,7 +3277,7 @@ package android.net.wifi { 
    field public deprecated int tx_rate;

  }



  public static class RttManager.WifiInformationElement {

  public static deprecated class RttManager.WifiInformationElement {

    ctor public RttManager.WifiInformationElement();

    field public byte[] data;

    field public byte id;

core/java/android/content/Context.java

+1 −0
Original line number Diff line number Diff line
@@ -3539,6 +3539,7 @@ public abstract class Context { 
     * @hide

     */

    @SystemApi

    @Deprecated

    public static final String WIFI_RTT_SERVICE = "rttmanager";



    /**

wifi/java/android/net/wifi/RttManager.java

+29 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ import android.net.wifi.rtt.RangingRequest; 
import android.net.wifi.rtt.RangingResult;

import android.net.wifi.rtt.RangingResultCallback;

import android.net.wifi.rtt.WifiRttManager;

import android.os.Handler;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.Log;
@@ -23,6 +24,7 @@ import java.util.List; 


/** @hide */

@SystemApi

@Deprecated

@SystemService(Context.WIFI_RTT_SERVICE)

public class RttManager {
@@ -180,6 +182,7 @@ public class RttManager { 
    /**

     * This class describe the RTT capability of the Hardware

     */

    @Deprecated

    public static class RttCapabilities implements Parcelable {

        /** @deprecated It is not supported*/

        @Deprecated
@@ -313,12 +316,16 @@ public class RttManager { 
             };

    }



    /**

     * This method is deprecated. Please use the {@link WifiRttManager} API.

     */

    @RequiresPermission(Manifest.permission.LOCATION_HARDWARE)

    public RttCapabilities getRttCapabilities() {

        return mRttCapabilities;

    }



    /** specifies parameters for RTT request */

    @Deprecated

    public static class RttParams {

        /**

         * type of destination device being ranged
@@ -501,6 +508,7 @@ public class RttManager { 
    }



    /** pseudo-private class used to parcel arguments */

    @Deprecated

    public static class ParcelableRttParams implements Parcelable {



        @NonNull
@@ -588,12 +596,14 @@ public class RttManager { 
                };

    }



    @Deprecated

    public static class WifiInformationElement {

        /** Information Element ID 0xFF means element is invalid. */

        public byte id;

        public byte[] data;

    }

    /** specifies RTT results */

    @Deprecated

    public static class RttResult {

        /** mac address of the device being ranged. */

        public String bssid;
@@ -745,6 +755,7 @@ public class RttManager { 




    /** pseudo-private class used to parcel results. */

    @Deprecated

    public static class ParcelableRttResults implements Parcelable {



        public RttResult mResults[];
@@ -910,7 +921,7 @@ public class RttManager { 
                };

    }





    @Deprecated

    public static interface RttListener {

        public void onSuccess(RttResult[] results);

        public void onFailure(int reason, String description);
@@ -919,6 +930,9 @@ public class RttManager { 


    /**

     * Request to start an RTT ranging

     * <p>

     * This method is deprecated. Please use the

     * {@link WifiRttManager#startRanging(RangingRequest, RangingResultCallback, Handler)} API.

     *

     * @param params  -- RTT request Parameters

     * @param listener -- Call back to inform RTT result
@@ -990,6 +1004,10 @@ public class RttManager { 
        }

    }



    /**

     * This method is deprecated and performs no function. Please use the {@link WifiRttManager}

     * API.

     */

    @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE)

    public void stopRanging(RttListener listener) {

        Log.e(TAG, "stopRanging: unsupported operation - nop");
@@ -1004,6 +1022,7 @@ public class RttManager { 
     * The client can freely destroy or reuse the callback after {@link RttManager#disableResponder}

     * is called.

     */

    @Deprecated

    public abstract static class ResponderCallback {

        /** Callback when responder is enabled. */

        public abstract void onResponderEnabled(ResponderConfig config);
@@ -1019,6 +1038,10 @@ public class RttManager { 
     * Note calling this method with the same callback when the responder is already enabled won't

     * change the responder state, a cached {@link ResponderConfig} from the last enabling will be

     * returned through the callback.

     * <p>

     * This method is deprecated and will throw an {@link UnsupportedOperationException}

     * exception. Please use the {@link WifiRttManager} API to perform a Wi-Fi Aware peer-to-peer

     * ranging.

     *

     * @param callback Callback for responder enabling/disabling result.

     * @throws IllegalArgumentException If {@code callback} is null.
@@ -1035,6 +1058,10 @@ public class RttManager { 
     * <p>

     * Calling this method when responder isn't enabled won't have any effect. The callback can be

     * reused for enabling responder after this method is called.

     * <p>

     * This method is deprecated and will throw an {@link UnsupportedOperationException}

     * exception. Please use the {@link WifiRttManager} API to perform a Wi-Fi Aware peer-to-peer

     * ranging.

     *

     * @param callback The same callback used for enabling responder.

     * @throws IllegalArgumentException If {@code callback} is null.
@@ -1051,6 +1078,7 @@ public class RttManager { 
     *

     * @see ScanResult

     */

    @Deprecated

    public static class ResponderConfig implements Parcelable {



        // TODO: make all fields final once we can get mac address from responder HAL APIs.