diff options
| author | 2016-09-27 20:06:56 +0000 | |
|---|---|---|
| committer | 2016-09-27 20:06:56 +0000 | |
| commit | fb43e8509bae2a7ce9b439382665d19c919df674 (patch) | |
| tree | 83f8080805b3c7bb8581b61728575b80e41c060b | |
| parent | c415e8c577f09f3c41ad53d52628b1c216952e32 (diff) | |
| parent | 62be010f2a06f41ca19106cff069ea6e9c06d2b0 (diff) | |
Merge "[NAN] Rename setTerminateNotificationEnabled per API review" am: 5d74bf9f95
am: 62be010f2a
Change-Id: I9354e65db8144c01bfbe748f3661f633d5a06c70
| -rw-r--r-- | wifi/java/android/net/wifi/nan/PublishConfig.java | 6 | ||||
| -rw-r--r-- | 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 5ffd54697e71..91513713daa3 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]. * <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; } diff --git a/wifi/java/android/net/wifi/nan/SubscribeConfig.java b/wifi/java/android/net/wifi/nan/SubscribeConfig.java index 28d5d914886f..b1dcd8fe49d0 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; } |