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

Commit 62be010f authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

Merge "[NAN] Rename setTerminateNotificationEnabled per API review" 

am: 5d74bf9f

Change-Id: I435c5377d7897cee20bba7a352eb55e85e996673
parents 29319829 5d74bf9f

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

+3 −3
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ public final class PublishConfig implements Parcelable { 
         * will be broadcast. When the count is reached an event will be

         * generated for {@link WifiNanDiscoverySessionCallback#onSessionTerminated(int)}

         * with {@link WifiNanDiscoverySessionCallback#TERMINATE_REASON_DONE} [unless

         * {@link #setEnableTerminateNotification(boolean)} disables the callback].

         * {@link #setTerminateNotificationEnabled(boolean)} disables the callback].

         * <p>

         *     Optional. 0 by default - indicating the session doesn't terminate on its own.

         *     Session will be terminated when {@link WifiNanDiscoveryBaseSession#destroy()} is
@@ -347,7 +347,7 @@ public final class PublishConfig implements Parcelable { 
         * an event will be generated for

         * {@link WifiNanDiscoverySessionCallback#onSessionTerminated(int)} with

         * {@link WifiNanDiscoverySessionCallback#TERMINATE_REASON_DONE}  [unless

         * {@link #setEnableTerminateNotification(boolean)} disables the callback].

         * {@link #setTerminateNotificationEnabled(boolean)} disables the callback].

         * <p>

         *     Optional. 0 by default - indicating the session doesn't terminate on its own.

         *     Session will be terminated when {@link WifiNanDiscoveryBaseSession#destroy()} is
@@ -377,7 +377,7 @@ public final class PublishConfig implements Parcelable { 
         * @return The builder to facilitate chaining

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

         */

        public Builder setEnableTerminateNotification(boolean enable) {

        public Builder setTerminateNotificationEnabled(boolean enable) {

            mEnableTerminateNotification = enable;

            return this;

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ public final class SubscribeConfig implements Parcelable { 
         * @return The builder to facilitate chaining

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

         */

        public Builder setEnableTerminateNotification(boolean enable) {

        public Builder setTerminateNotificationEnabled(boolean enable) {

            mEnableTerminateNotification = enable;

            return this;

        }