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

Commit 2fe15078 authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

Merge "[NAN] Remove builder API using String to translate to byte[]" am:... 

Merge "[NAN] Remove builder API using String to translate to byte[]" am: 1bca5ad2 am: 62bceaab am: fd033a47
am: cc9a933e

Change-Id: Ifb75b7c5e9809b6a0ce4c93708ef588d49fc477d
parents 77555df0 cc9a933e

wifi/java/android/net/wifi/nan/PublishConfig.java

+0 −19
Original line number Diff line number Diff line
@@ -256,25 +256,6 @@ public final class PublishConfig implements Parcelable { 
            return this;

        }



        /**

         * Specify service specific information for the publish session - a simple wrapper

         * of {@link PublishConfig.Builder#setServiceSpecificInfo(byte[])}

         * obtaining the data from a String.

         * <p>

         *     Optional. Empty by default.

         *

         * @param serviceSpecificInfoStr The service specific information string

         *            to be included (as a byte array) in the publish

         *            information.

         *

         * @return The builder to facilitate chaining

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

         */

        public Builder setServiceSpecificInfo(@NonNull String serviceSpecificInfoStr) {

            mServiceSpecificInfo = serviceSpecificInfoStr.getBytes();

            return this;

        }



        /**

         * The match filter for a publish session. Used to determine whether a service

         * discovery occurred - in addition to relying on the service name.

wifi/java/android/net/wifi/nan/SubscribeConfig.java

+0 −19
Original line number Diff line number Diff line
@@ -288,25 +288,6 @@ public final class SubscribeConfig implements Parcelable { 
            return this;

        }



        /**

         * Specify service specific information for the subscribe session - a simple wrapper

         * of {@link SubscribeConfig.Builder#setServiceSpecificInfo(byte[])}

         * obtaining the data from a String.

         * <p>

         *     Optional. Empty by default.

         *

         * @param serviceSpecificInfoStr The service specific information string

         *            to be included (as a byte array) in the subscribe

         *            information.

         *

         * @return The builder to facilitate chaining

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

         */

        public Builder setServiceSpecificInfo(@NonNull String serviceSpecificInfoStr) {

            mServiceSpecificInfo = serviceSpecificInfoStr.getBytes();

            return this;

        }



        /**

         * The match filter for a subscribe session. Used to determine whether a service

         * discovery occurred - in addition to relying on the service name.