From 6c48c3373501db864d7f5afd13aefb08e67fc5a5 Mon Sep 17 00:00:00 2001 From: Etan Cohen Date: Tue, 27 Sep 2016 09:51:37 -0700 Subject: [PATCH] [NAN] Rename setTerminateNotificationEnabled per API review (cherry-pick of commit 7df9b7a1039ea8e34e82e650cebd1025a2591580) Bug: 31470256 Test: unit tests + integrated (sl4a) tests Change-Id: I1554b5b7961a5c46656a40ad395431125da7aa7f --- wifi/java/android/net/wifi/nan/PublishConfig.java | 6 +++--- wifi/java/android/net/wifi/nan/SubscribeConfig.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wifi/java/android/net/wifi/nan/PublishConfig.java b/wifi/java/android/net/wifi/nan/PublishConfig.java index 5ffd54697e714..91513713daa38 100644 --- a/wifi/java/android/net/wifi/nan/PublishConfig.java +++ b/wifi/java/android/net/wifi/nan/PublishConfig.java @@ -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]. *

* 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]. *

* 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; } diff --git a/wifi/java/android/net/wifi/nan/SubscribeConfig.java b/wifi/java/android/net/wifi/nan/SubscribeConfig.java index 28d5d914886fc..b1dcd8fe49d06 100644 --- a/wifi/java/android/net/wifi/nan/SubscribeConfig.java +++ b/wifi/java/android/net/wifi/nan/SubscribeConfig.java @@ -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; }