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

Commit c3ededf6 authored by Etan Cohen's avatar Etan Cohen Committed by Android (Google) Code Review
Browse files

Merge "[AWARE] Enhance debug logs"

parents 446ecc9c 116d2cab

wifi/java/android/net/wifi/aware/PublishConfig.java

+11 −6
Original line number Diff line number Diff line
@@ -93,12 +93,17 @@ public final class PublishConfig implements Parcelable { 


    @Override

    public String toString() {

        return "PublishConfig [mServiceName='" + mServiceName + ", mServiceSpecificInfo='" + (

                (mServiceSpecificInfo == null) ? "null" : HexEncoding.encode(mServiceSpecificInfo))

                + ", mMatchFilter=" + (new TlvBufferUtils.TlvIterable(0, 1,

                mMatchFilter)).toString() + ", mPublishType=" + mPublishType

                + ", mTtlSec=" + mTtlSec + ", mEnableTerminateNotification="

                + mEnableTerminateNotification + "]";

        return "PublishConfig [mServiceName='" + (mServiceName == null ? "<null>" : String.valueOf(

                HexEncoding.encode(mServiceName))) + ", mServiceName.length=" + (

                mServiceName == null ? 0 : mServiceName.length) + ", mServiceSpecificInfo='" + (

                (mServiceSpecificInfo == null) ? "<null>" : String.valueOf(

                        HexEncoding.encode(mServiceSpecificInfo)))

                + ", mServiceSpecificInfo.length=" + (mServiceSpecificInfo == null ? 0

                : mServiceSpecificInfo.length) + ", mMatchFilter="

                + (new TlvBufferUtils.TlvIterable(0, 1, mMatchFilter)).toString()

                + ", mMatchFilter.length=" + (mMatchFilter == null ? 0 : mMatchFilter.length)

                + ", mPublishType=" + mPublishType + ", mTtlSec=" + mTtlSec

                + ", mEnableTerminateNotification=" + mEnableTerminateNotification + "]";

    }



    @Override

wifi/java/android/net/wifi/aware/SubscribeConfig.java

+11 −7
Original line number Diff line number Diff line
@@ -92,13 +92,17 @@ public final class SubscribeConfig implements Parcelable { 


    @Override

    public String toString() {

        return "SubscribeConfig [mServiceName='" + mServiceName + ", mServiceSpecificInfo='" + (

                (mServiceSpecificInfo == null) ? "null" : HexEncoding.encode(mServiceSpecificInfo))

                + ", mMatchFilter=" + (new TlvBufferUtils.TlvIterable(0, 1,

                mMatchFilter)).toString() + ", mSubscribeType=" + mSubscribeType

                + ", mTtlSec=" + mTtlSec

                + ", mEnableTerminateNotification=" + mEnableTerminateNotification

                + "]";

        return "SubscribeConfig [mServiceName='" + (mServiceName == null ? "<null>"

                : String.valueOf(HexEncoding.encode(mServiceName))) + ", mServiceName.length=" + (

                mServiceName == null ? 0 : mServiceName.length) + ", mServiceSpecificInfo='" + (

                (mServiceSpecificInfo == null) ? "<null>" : String.valueOf(

                        HexEncoding.encode(mServiceSpecificInfo)))

                + ", mServiceSpecificInfo.length=" + (mServiceSpecificInfo == null ? 0

                : mServiceSpecificInfo.length) + ", mMatchFilter="

                + (new TlvBufferUtils.TlvIterable(0, 1, mMatchFilter)).toString()

                + ", mMatchFilter.length=" + (mMatchFilter == null ? 0 : mMatchFilter.length)

                + ", mSubscribeType=" + mSubscribeType + ", mTtlSec=" + mTtlSec

                + ", mEnableTerminateNotification=" + mEnableTerminateNotification + "]";

    }



    @Override