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

Commit fd033a47 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: 1bca5ad2

am: 62bceaab

Change-Id: I95f3e2581de041cef91f1e3f802b574a020df5c3
parents 03e8ade5 62bceaab
Loading
Loading
Loading
Loading
+0 −19
Original line number Original line Diff line number Diff line
@@ -256,25 +256,6 @@ public final class PublishConfig implements Parcelable {
            return this;
            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
         * The match filter for a publish session. Used to determine whether a service
         * discovery occurred - in addition to relying on the service name.
         * discovery occurred - in addition to relying on the service name.
+0 −19
Original line number Original line Diff line number Diff line
@@ -288,25 +288,6 @@ public final class SubscribeConfig implements Parcelable {
            return this;
            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
         * The match filter for a subscribe session. Used to determine whether a service
         * discovery occurred - in addition to relying on the service name.
         * discovery occurred - in addition to relying on the service name.