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

Commit a2614dd6 authored by Steve Malkos's avatar Steve Malkos Committed by android-build-merger
Browse files

Merge "Expose RTT capability APIs for secure RTT." into nyc-dev am: 53afdf29 

am: 0330f407

* commit '0330f407':
  Expose RTT capability APIs for secure RTT.

Change-Id: I5c4d7c0ebd4ee28ddef38f69291353b78c16125e
parents 0b8068ea 0330f407

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -26425,9 +26425,11 @@ package android.net.wifi { 
    field public int bwSupported;

    field public boolean lciSupported;

    field public boolean lcrSupported;

    field public int mcVersion;

    field public boolean oneSidedRttSupported;

    field public int preambleSupported;

    field public boolean responderSupported;

    field public boolean secureRttSupported;

    field public deprecated boolean supportedPeerType;

    field public deprecated boolean supportedType;

    field public boolean twoSided11McRttSupported;

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

+25 −12
Original line number Diff line number Diff line
@@ -199,6 +199,12 @@ public class RttManager { 
        // Whether STA responder role is supported.

        public boolean responderSupported;



        /** Whether the secure RTT protocol is supported. */

        public boolean secureRttSupported;



        /** Draft 11mc version supported, including major and minor version. e.g, draft 4.3 is 43 */

        public int mcVersion;



        @Override

        public String toString() {

            StringBuffer sb = new StringBuffer();
@@ -223,7 +229,7 @@ public class RttManager { 
                sb.append("VHT ");

            }



            sb.append("is supported. \n");

            sb.append("is supported. ");



            if ((bwSupported & RTT_BW_5_SUPPORT) != 0) {

                sb.append("5 MHz ");
@@ -252,7 +258,10 @@ public class RttManager { 
            sb.append("is supported.");



            sb.append(" STA responder role is ")

                .append(responderSupported ? "supported" : "not supported.");

                    .append(responderSupported ? "supported" : "not supported");

            sb.append(" Secure RTT protocol is ")

                    .append(secureRttSupported ? "supported" : "not supported");

            sb.append(" 11mc version is " + mcVersion);



            return sb.toString();

        }
@@ -272,6 +281,8 @@ public class RttManager { 
            dest.writeInt(preambleSupported);

            dest.writeInt(bwSupported);

            dest.writeInt(responderSupported ? 1 : 0);

            dest.writeInt(secureRttSupported ? 1 : 0);

            dest.writeInt(mcVersion);

        }



        /** Implement the Parcelable interface {@hide} */
@@ -287,6 +298,8 @@ public class RttManager { 
                capabilities.preambleSupported = in.readInt();

                capabilities.bwSupported = in.readInt();

                capabilities.responderSupported = (in.readInt() == 1);

                capabilities.secureRttSupported = (in.readInt() == 1);

                capabilities.mcVersion = in.readInt();

                return capabilities;

            }

                /** Implement the Parcelable interface {@hide} */