From 116d2cabb134effcb2392eb2b1a11b11173f425e Mon Sep 17 00:00:00 2001 From: Etan Cohen Date: Fri, 19 May 2017 13:38:25 -0700 Subject: [PATCH] [AWARE] Enhance debug logs Add information to the debug message. Bug: 31940045 Test: unit tests, integration (sl4a) tests Change-Id: I076825164491a2025a8d04ebb5898a0e742af312 --- wifi/java/android/net/wifi/aware/PublishConfig.java | 17 +++++++++++------ wifi/java/android/net/wifi/aware/SubscribeConfig.java | 18 +++++++++++------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/wifi/java/android/net/wifi/aware/PublishConfig.java b/wifi/java/android/net/wifi/aware/PublishConfig.java index 0f1e99295bc1..d018620719e2 100644 --- a/wifi/java/android/net/wifi/aware/PublishConfig.java +++ b/wifi/java/android/net/wifi/aware/PublishConfig.java @@ -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 ? "" : String.valueOf( + HexEncoding.encode(mServiceName))) + ", mServiceName.length=" + ( + mServiceName == null ? 0 : mServiceName.length) + ", mServiceSpecificInfo='" + ( + (mServiceSpecificInfo == 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 diff --git a/wifi/java/android/net/wifi/aware/SubscribeConfig.java b/wifi/java/android/net/wifi/aware/SubscribeConfig.java index 31e7e8e86c90..4bf2fb6aa6fe 100644 --- a/wifi/java/android/net/wifi/aware/SubscribeConfig.java +++ b/wifi/java/android/net/wifi/aware/SubscribeConfig.java @@ -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 ? "" + : String.valueOf(HexEncoding.encode(mServiceName))) + ", mServiceName.length=" + ( + mServiceName == null ? 0 : mServiceName.length) + ", mServiceSpecificInfo='" + ( + (mServiceSpecificInfo == 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 -- 2.11.0