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

Commit 75e324f4 authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

Merge "[NAN] Make parcelable class final - per API linter" am: 3fcabac3 am:... 

Merge "[NAN] Make parcelable class final - per API linter" am: 3fcabac3 am: 5a07e3b2 am: eb1c7afd
am: ff64f55a

Change-Id: I8ae44b6f28d8e6a2c7e2e311b8404d6d089d4f50
parents 36110fa1 ff64f55a

wifi/java/android/net/wifi/nan/ConfigRequest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ import android.os.Parcelable; 
 *

 *

 * @hide PROPOSED_NAN_API

 * @hide PROPOSED_NAN_API

 */

 */

public class ConfigRequest implements Parcelable {

public final class ConfigRequest implements Parcelable {

    /**

    /**

     * Lower range of possible cluster ID.

     * Lower range of possible cluster ID.

     *

     *

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ import java.util.Arrays; 
 *

 *

 * @hide PROPOSED_NAN_API

 * @hide PROPOSED_NAN_API

 */

 */

public class PublishConfig implements Parcelable {

public final class PublishConfig implements Parcelable {

    /** @hide */

    /** @hide */

    @IntDef({

    @IntDef({

            PUBLISH_TYPE_UNSOLICITED, PUBLISH_TYPE_SOLICITED })

            PUBLISH_TYPE_UNSOLICITED, PUBLISH_TYPE_SOLICITED })

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ import java.util.Arrays; 
 *

 *

 * @hide PROPOSED_NAN_API

 * @hide PROPOSED_NAN_API

 */

 */

public class SubscribeConfig implements Parcelable {

public final class SubscribeConfig implements Parcelable {

    /** @hide */

    /** @hide */

    @IntDef({

    @IntDef({

            SUBSCRIBE_TYPE_PASSIVE, SUBSCRIBE_TYPE_ACTIVE })

            SUBSCRIBE_TYPE_PASSIVE, SUBSCRIBE_TYPE_ACTIVE })