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

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

Merge "[AWARE] Uhide the RTT in context of Aware discovery API"

parents 0ff8dabf 6570644d

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -27392,6 +27392,7 @@ package android.net.wifi.aware { 
    method public void onMessageSendSucceeded(int);

    method public void onPublishStarted(android.net.wifi.aware.PublishDiscoverySession);

    method public void onServiceDiscovered(android.net.wifi.aware.PeerHandle, byte[], java.util.List<byte[]>);

    method public void onServiceDiscoveredWithinRange(android.net.wifi.aware.PeerHandle, byte[], java.util.List<byte[]>, int);

    method public void onSessionConfigFailed();

    method public void onSessionConfigUpdated();

    method public void onSessionTerminated();
@@ -27419,6 +27420,7 @@ package android.net.wifi.aware { 
    method public android.net.wifi.aware.PublishConfig build();

    method public android.net.wifi.aware.PublishConfig.Builder setMatchFilter(java.util.List<byte[]>);

    method public android.net.wifi.aware.PublishConfig.Builder setPublishType(int);

    method public android.net.wifi.aware.PublishConfig.Builder setRangingEnabled(boolean);

    method public android.net.wifi.aware.PublishConfig.Builder setServiceName(java.lang.String);

    method public android.net.wifi.aware.PublishConfig.Builder setServiceSpecificInfo(byte[]);

    method public android.net.wifi.aware.PublishConfig.Builder setTerminateNotificationEnabled(boolean);
@@ -27441,6 +27443,8 @@ package android.net.wifi.aware { 
    ctor public SubscribeConfig.Builder();

    method public android.net.wifi.aware.SubscribeConfig build();

    method public android.net.wifi.aware.SubscribeConfig.Builder setMatchFilter(java.util.List<byte[]>);

    method public android.net.wifi.aware.SubscribeConfig.Builder setMaxDistanceMm(int);

    method public android.net.wifi.aware.SubscribeConfig.Builder setMinDistanceMm(int);

    method public android.net.wifi.aware.SubscribeConfig.Builder setServiceName(java.lang.String);

    method public android.net.wifi.aware.SubscribeConfig.Builder setServiceSpecificInfo(byte[]);

    method public android.net.wifi.aware.SubscribeConfig.Builder setSubscribeType(int);

wifi/java/android/net/wifi/aware/DiscoverySessionCallback.java

+0 −1
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ public class DiscoverySessionCallback { 
     *                    {@link SubscribeConfig#SUBSCRIBE_TYPE_ACTIVE} discovery sessions this

     *                    is the subscriber's match filter.

     * @param distanceMm The measured distance to the Publisher in mm.

     * @hide

     */

    public void onServiceDiscoveredWithinRange(PeerHandle peerHandle,

        byte[] serviceSpecificInfo, List<byte[]> matchFilter, int distanceMm) {

wifi/java/android/net/wifi/aware/PublishConfig.java

+0 −2
Original line number Diff line number Diff line
@@ -376,8 +376,6 @@ public final class PublishConfig implements Parcelable { 
         *

         * @return The builder to facilitate chaining

         *         {@code builder.setXXX(..).setXXX(..)}.

         *

         * @hide

         */

        public Builder setRangingEnabled(boolean enable) {

            mEnableRanging = enable;

wifi/java/android/net/wifi/aware/SubscribeConfig.java

+0 −4
Original line number Diff line number Diff line
@@ -435,8 +435,6 @@ public final class SubscribeConfig implements Parcelable { 
         *

         * @return The builder to facilitate chaining

         *         {@code builder.setXXX(..).setXXX(..)}.

         *

         * @hide

         */

        public Builder setMinDistanceMm(int minDistanceMm) {

            mMinDistanceMm = minDistanceMm;
@@ -466,8 +464,6 @@ public final class SubscribeConfig implements Parcelable { 
         *

         * @return The builder to facilitate chaining

         *         {@code builder.setXXX(..).setXXX(..)}.

         *

         * @hide

         */

        public Builder setMaxDistanceMm(int maxDistanceMm) {

            mMaxDistanceMm = maxDistanceMm;