Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[NAN] Rename setTerminateNotificationEnabled per API review"

Browse Source 
am: 5d74bf9f95

Change-Id: I435c5377d7897cee20bba7a352eb55e85e996673
This commit is contained in:
Etan Cohen
2016-09-27 20:02:00 +00:00
committed by android-build-merger
parent 29319829fb 5d74bf9f95
commit 62be010f2a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wifi/java/android/net/wifi/nan/PublishConfig.java
View File

@@ -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;
}

2
wifi/java/android/net/wifi/nan/SubscribeConfig.java
View File

@@ -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;
}