summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Etan Cohen <etancohen@google.com> 2016-09-19 16:25:31 +0000
committer android-build-merger <android-build-merger@google.com> 2016-09-19 16:25:31 +0000
commitff64f55acbbd03e7dfaf31af343d8810f99fea42 (patch)
treeafe03c530f9f44393ad67a369eb619de85cf879e
parent12622871bcbe67bdcc4caf9a3fb0b0499df4fb13 (diff)
parenteb1c7afdcfcbcbed87db7decced073dfe956f9bb (diff)
Merge "[NAN] Make parcelable class final - per API linter" am: 3fcabac35a am: 5a07e3b2e8
am: eb1c7afdcf Change-Id: If0f1f4de0fd28c0c65cb46bd958b99f76fed854b
-rw-r--r--wifi/java/android/net/wifi/nan/ConfigRequest.java2
-rw-r--r--wifi/java/android/net/wifi/nan/PublishConfig.java2
-rw-r--r--wifi/java/android/net/wifi/nan/SubscribeConfig.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/wifi/java/android/net/wifi/nan/ConfigRequest.java b/wifi/java/android/net/wifi/nan/ConfigRequest.java
index 44544de0e9fd..5d41579ed665 100644
--- a/wifi/java/android/net/wifi/nan/ConfigRequest.java
+++ b/wifi/java/android/net/wifi/nan/ConfigRequest.java
@@ -30,7 +30,7 @@ import android.os.Parcelable;
*
* @hide PROPOSED_NAN_API
*/
-public class ConfigRequest implements Parcelable {
+public final class ConfigRequest implements Parcelable {
/**
* Lower range of possible cluster ID.
*
diff --git a/wifi/java/android/net/wifi/nan/PublishConfig.java b/wifi/java/android/net/wifi/nan/PublishConfig.java
index 71f99d98a7bc..6203f9539e7c 100644
--- a/wifi/java/android/net/wifi/nan/PublishConfig.java
+++ b/wifi/java/android/net/wifi/nan/PublishConfig.java
@@ -37,7 +37,7 @@ import java.util.Arrays;
*
* @hide PROPOSED_NAN_API
*/
-public class PublishConfig implements Parcelable {
+public final class PublishConfig implements Parcelable {
/** @hide */
@IntDef({
PUBLISH_TYPE_UNSOLICITED, PUBLISH_TYPE_SOLICITED })
diff --git a/wifi/java/android/net/wifi/nan/SubscribeConfig.java b/wifi/java/android/net/wifi/nan/SubscribeConfig.java
index 7904875a4064..5a2c76272f78 100644
--- a/wifi/java/android/net/wifi/nan/SubscribeConfig.java
+++ b/wifi/java/android/net/wifi/nan/SubscribeConfig.java
@@ -37,7 +37,7 @@ import java.util.Arrays;
*
* @hide PROPOSED_NAN_API
*/
-public class SubscribeConfig implements Parcelable {
+public final class SubscribeConfig implements Parcelable {
/** @hide */
@IntDef({
SUBSCRIBE_TYPE_PASSIVE, SUBSCRIBE_TYPE_ACTIVE })