[AWARE] Configure DBG vs. VDBG
Move some messages to normal DBG vs. VDBG to allow verbose run-time
debugging.
Bug: 69432628
Test: build, enable verbose & verify log
Change-Id: I7162dca0daf728657fb946b36299bede35fa8a3b
diff --git a/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java b/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java
index 8088d6e..f8deb05 100644
--- a/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java
+++ b/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java
@@ -589,11 +589,11 @@
* - i.e. when we're proceeding with data-path setup).
*/
public void handleDataPathTimeout(NetworkSpecifier networkSpecifier) {
- if (VDBG) Log.v(TAG, "handleDataPathTimeout: networkSpecifier=" + networkSpecifier);
+ if (mDbg) Log.v(TAG, "handleDataPathTimeout: networkSpecifier=" + networkSpecifier);
AwareNetworkRequestInformation nnri = mNetworkRequestsCache.remove(networkSpecifier);
if (nnri == null) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG,
"handleDataPathTimeout: network request not found for networkSpecifier="
+ networkSpecifier);
diff --git a/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java b/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java
index f3ada5d..66bbff5 100644
--- a/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java
+++ b/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java
@@ -171,7 +171,7 @@
* match with the original request.
*/
public boolean getCapabilities(short transactionId) {
- if (VDBG) Log.v(TAG, "getCapabilities: transactionId=" + transactionId);
+ if (mDbg) Log.v(TAG, "getCapabilities: transactionId=" + transactionId);
IWifiNanIface iface = mHal.getWifiNanIface();
if (iface == null) {
@@ -208,7 +208,7 @@
public boolean enableAndConfigure(short transactionId, ConfigRequest configRequest,
boolean notifyIdentityChange, boolean initialConfiguration, boolean isInteractive,
boolean isIdle) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "enableAndConfigure: transactionId=" + transactionId + ", configRequest="
+ configRequest + ", notifyIdentityChange=" + notifyIdentityChange
+ ", initialConfiguration=" + initialConfiguration
@@ -370,7 +370,7 @@
* used in the async callback to match with the original request.
*/
public boolean disable(short transactionId) {
- if (VDBG) Log.d(TAG, "disable");
+ if (mDbg) Log.d(TAG, "disable");
IWifiNanIface iface = mHal.getWifiNanIface();
if (iface == null) {
@@ -402,7 +402,7 @@
* @param publishConfig Configuration of the discovery session.
*/
public boolean publish(short transactionId, byte publishId, PublishConfig publishConfig) {
- if (VDBG) {
+ if (mDbg) {
Log.d(TAG, "publish: transactionId=" + transactionId + ", publishId=" + publishId
+ ", config=" + publishConfig);
}
@@ -466,7 +466,7 @@
*/
public boolean subscribe(short transactionId, byte subscribeId,
SubscribeConfig subscribeConfig) {
- if (VDBG) {
+ if (mDbg) {
Log.d(TAG, "subscribe: transactionId=" + transactionId + ", subscribeId=" + subscribeId
+ ", config=" + subscribeConfig);
}
@@ -546,7 +546,7 @@
*/
public boolean sendMessage(short transactionId, byte pubSubId, int requestorInstanceId,
byte[] dest, byte[] message, int messageId) {
- if (VDBG) {
+ if (mDbg) {
Log.d(TAG,
"sendMessage: transactionId=" + transactionId + ", pubSubId=" + pubSubId
+ ", requestorInstanceId=" + requestorInstanceId + ", dest="
@@ -594,7 +594,7 @@
* creating a session.
*/
public boolean stopPublish(short transactionId, byte pubSubId) {
- if (VDBG) {
+ if (mDbg) {
Log.d(TAG, "stopPublish: transactionId=" + transactionId + ", pubSubId=" + pubSubId);
}
@@ -627,7 +627,7 @@
* creating a session.
*/
public boolean stopSubscribe(short transactionId, byte pubSubId) {
- if (VDBG) {
+ if (mDbg) {
Log.d(TAG, "stopSubscribe: transactionId=" + transactionId + ", pubSubId=" + pubSubId);
}
@@ -660,7 +660,7 @@
* @param interfaceName The name of the interface, e.g. "aware0".
*/
public boolean createAwareNetworkInterface(short transactionId, String interfaceName) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "createAwareNetworkInterface: transactionId=" + transactionId + ", "
+ "interfaceName=" + interfaceName);
}
@@ -693,7 +693,7 @@
* @param interfaceName The name of the interface, e.g. "aware0".
*/
public boolean deleteAwareNetworkInterface(short transactionId, String interfaceName) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "deleteAwareNetworkInterface: transactionId=" + transactionId + ", "
+ "interfaceName=" + interfaceName);
}
@@ -739,7 +739,7 @@
public boolean initiateDataPath(short transactionId, int peerId, int channelRequestType,
int channel, byte[] peer, String interfaceName, byte[] pmk, String passphrase,
boolean isOutOfBand, Capabilities capabilities) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "initiateDataPath: transactionId=" + transactionId + ", peerId=" + peerId
+ ", channelRequestType=" + channelRequestType + ", channel=" + channel
+ ", peer=" + String.valueOf(HexEncoding.encode(peer)) + ", interfaceName="
@@ -816,7 +816,7 @@
public boolean respondToDataPathRequest(short transactionId, boolean accept, int ndpId,
String interfaceName, byte[] pmk, String passphrase, boolean isOutOfBand,
Capabilities capabilities) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "respondToDataPathRequest: transactionId=" + transactionId + ", accept="
+ accept + ", int ndpId=" + ndpId + ", interfaceName=" + interfaceName);
}
@@ -878,7 +878,7 @@
* @param ndpId The NDP (Aware data path) ID to be terminated.
*/
public boolean endDataPath(short transactionId, int ndpId) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "endDataPath: transactionId=" + transactionId + ", ndpId=" + ndpId);
}
diff --git a/service/java/com/android/server/wifi/aware/WifiAwareNativeCallback.java b/service/java/com/android/server/wifi/aware/WifiAwareNativeCallback.java
index 396187b..78f8a28 100644
--- a/service/java/com/android/server/wifi/aware/WifiAwareNativeCallback.java
+++ b/service/java/com/android/server/wifi/aware/WifiAwareNativeCallback.java
@@ -141,7 +141,7 @@
@Override
public void notifyCapabilitiesResponse(short id, WifiNanStatus status,
NanCapabilities capabilities) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "notifyCapabilitiesResponse: id=" + id + ", status=" + statusString(status)
+ ", capabilities=" + capabilities);
}
@@ -176,7 +176,7 @@
@Override
public void notifyEnableResponse(short id, WifiNanStatus status) {
- if (VDBG) Log.v(TAG, "notifyEnableResponse: id=" + id + ", status=" + statusString(status));
+ if (mDbg) Log.v(TAG, "notifyEnableResponse: id=" + id + ", status=" + statusString(status));
if (status.status == NanStatusType.ALREADY_ENABLED) {
Log.wtf(TAG, "notifyEnableResponse: id=" + id + ", already enabled!?");
@@ -192,7 +192,7 @@
@Override
public void notifyConfigResponse(short id, WifiNanStatus status) {
- if (VDBG) Log.v(TAG, "notifyConfigResponse: id=" + id + ", status=" + statusString(status));
+ if (mDbg) Log.v(TAG, "notifyConfigResponse: id=" + id + ", status=" + statusString(status));
if (status.status == NanStatusType.SUCCESS) {
mWifiAwareStateManager.onConfigSuccessResponse(id);
@@ -203,7 +203,7 @@
@Override
public void notifyDisableResponse(short id, WifiNanStatus status) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "notifyDisableResponse: id=" + id + ", status=" + statusString(status));
}
@@ -216,7 +216,7 @@
@Override
public void notifyStartPublishResponse(short id, WifiNanStatus status, byte publishId) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "notifyStartPublishResponse: id=" + id + ", status=" + statusString(status)
+ ", publishId=" + publishId);
}
@@ -230,7 +230,7 @@
@Override
public void notifyStopPublishResponse(short id, WifiNanStatus status) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "notifyStopPublishResponse: id=" + id + ", status=" + statusString(status));
}
@@ -244,7 +244,7 @@
@Override
public void notifyStartSubscribeResponse(short id, WifiNanStatus status, byte subscribeId) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "notifyStartSubscribeResponse: id=" + id + ", status=" + statusString(status)
+ ", subscribeId=" + subscribeId);
}
@@ -258,7 +258,7 @@
@Override
public void notifyStopSubscribeResponse(short id, WifiNanStatus status) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "notifyStopSubscribeResponse: id=" + id + ", status="
+ statusString(status));
}
@@ -273,7 +273,7 @@
@Override
public void notifyTransmitFollowupResponse(short id, WifiNanStatus status) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "notifyTransmitFollowupResponse: id=" + id + ", status="
+ statusString(status));
}
@@ -287,7 +287,7 @@
@Override
public void notifyCreateDataInterfaceResponse(short id, WifiNanStatus status) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "notifyCreateDataInterfaceResponse: id=" + id + ", status="
+ statusString(status));
}
@@ -298,7 +298,7 @@
@Override
public void notifyDeleteDataInterfaceResponse(short id, WifiNanStatus status) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "notifyDeleteDataInterfaceResponse: id=" + id + ", status="
+ statusString(status));
}
@@ -310,7 +310,7 @@
@Override
public void notifyInitiateDataPathResponse(short id, WifiNanStatus status,
int ndpInstanceId) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "notifyInitiateDataPathResponse: id=" + id + ", status="
+ statusString(status) + ", ndpInstanceId=" + ndpInstanceId);
}
@@ -324,7 +324,7 @@
@Override
public void notifyRespondToDataPathIndicationResponse(short id, WifiNanStatus status) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "notifyRespondToDataPathIndicationResponse: id=" + id
+ ", status=" + statusString(status));
}
@@ -335,7 +335,7 @@
@Override
public void notifyTerminateDataPathResponse(short id, WifiNanStatus status) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "notifyTerminateDataPathResponse: id=" + id + ", status="
+ statusString(status));
}
@@ -346,7 +346,7 @@
@Override
public void eventClusterEvent(NanClusterEventInd event) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "eventClusterEvent: eventType=" + event.eventType + ", addr="
+ String.valueOf(HexEncoding.encode(event.addr)));
}
@@ -367,7 +367,7 @@
@Override
public void eventDisabled(WifiNanStatus status) {
- if (VDBG) Log.v(TAG, "eventDisabled: status=" + statusString(status));
+ if (mDbg) Log.v(TAG, "eventDisabled: status=" + statusString(status));
incrementCbCount(CB_EV_DISABLED);
mWifiAwareStateManager.onAwareDownNotification(status.status);
@@ -375,7 +375,7 @@
@Override
public void eventPublishTerminated(byte sessionId, WifiNanStatus status) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "eventPublishTerminated: sessionId=" + sessionId + ", status="
+ statusString(status));
}
@@ -386,7 +386,7 @@
@Override
public void eventSubscribeTerminated(byte sessionId, WifiNanStatus status) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "eventSubscribeTerminated: sessionId=" + sessionId + ", status="
+ statusString(status));
}
@@ -397,7 +397,7 @@
@Override
public void eventMatch(NanMatchInd event) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "eventMatch: discoverySessionId=" + event.discoverySessionId + ", peerId="
+ event.peerId + ", addr=" + String.valueOf(HexEncoding.encode(event.addr))
+ ", serviceSpecificInfo=" + Arrays.toString(
@@ -420,7 +420,7 @@
@Override
public void eventMatchExpired(byte discoverySessionId, int peerId) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "eventMatchExpired: discoverySessionId=" + discoverySessionId
+ ", peerId=" + peerId);
}
@@ -431,7 +431,7 @@
@Override
public void eventFollowupReceived(NanFollowupReceivedInd event) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "eventFollowupReceived: discoverySessionId=" + event.discoverySessionId
+ ", peerId=" + event.peerId + ", addr=" + String.valueOf(
HexEncoding.encode(event.addr)) + ", serviceSpecificInfo=" + Arrays.toString(
@@ -446,7 +446,7 @@
@Override
public void eventTransmitFollowup(short id, WifiNanStatus status) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "eventTransmitFollowup: id=" + id + ", status=" + statusString(status));
}
incrementCbCount(CB_EV_TRANSMIT_FOLLOWUP);
@@ -460,7 +460,7 @@
@Override
public void eventDataPathRequest(NanDataPathRequestInd event) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "eventDataPathRequest: discoverySessionId=" + event.discoverySessionId
+ ", peerDiscMacAddr=" + String.valueOf(
HexEncoding.encode(event.peerDiscMacAddr)) + ", ndpInstanceId="
@@ -474,7 +474,7 @@
@Override
public void eventDataPathConfirm(NanDataPathConfirmInd event) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "onDataPathConfirm: ndpInstanceId=" + event.ndpInstanceId
+ ", peerNdiMacAddr=" + String.valueOf(HexEncoding.encode(event.peerNdiMacAddr))
+ ", dataPathSetupSuccess=" + event.dataPathSetupSuccess + ", reason="
@@ -489,7 +489,7 @@
@Override
public void eventDataPathTerminated(int ndpInstanceId) {
- if (VDBG) Log.v(TAG, "eventDataPathTerminated: ndpInstanceId=" + ndpInstanceId);
+ if (mDbg) Log.v(TAG, "eventDataPathTerminated: ndpInstanceId=" + ndpInstanceId);
incrementCbCount(CB_EV_DATA_PATH_TERMINATED);
mWifiAwareStateManager.onDataPathEndNotification(ndpInstanceId);
diff --git a/service/java/com/android/server/wifi/aware/WifiAwareNativeManager.java b/service/java/com/android/server/wifi/aware/WifiAwareNativeManager.java
index a82abbb..dd19d7b 100644
--- a/service/java/com/android/server/wifi/aware/WifiAwareNativeManager.java
+++ b/service/java/com/android/server/wifi/aware/WifiAwareNativeManager.java
@@ -108,7 +108,7 @@
*/
private void tryToGetAware() {
synchronized (mLock) {
- if (VDBG) Log.v(TAG, "tryToGetAware: mWifiNanIface=" + mWifiNanIface);
+ if (mDbg) Log.v(TAG, "tryToGetAware: mWifiNanIface=" + mWifiNanIface);
if (mWifiNanIface != null) {
return;
@@ -116,9 +116,9 @@
IWifiNanIface iface = mHalDeviceManager.createNanIface(mInterfaceDestroyedListener,
mHandler);
if (iface == null) {
- if (VDBG) Log.v(TAG, "Was not able to obtain an IWifiNanIface");
+ Log.e(TAG, "Was not able to obtain an IWifiNanIface");
} else {
- if (VDBG) Log.v(TAG, "Obtained an IWifiNanIface");
+ if (mDbg) Log.v(TAG, "Obtained an IWifiNanIface");
try {
WifiStatus status = iface.registerEventCallback(mWifiAwareNativeCallback);
@@ -141,7 +141,7 @@
private void awareIsDown() {
synchronized (mLock) {
- if (VDBG) Log.v(TAG, "awareIsDown: mWifiNanIface=" + mWifiNanIface);
+ if (mDbg) Log.v(TAG, "awareIsDown: mWifiNanIface=" + mWifiNanIface);
if (mWifiNanIface != null) {
mWifiNanIface = null;
mWifiAwareStateManager.disableUsage();
@@ -153,7 +153,7 @@
HalDeviceManager.InterfaceDestroyedListener {
@Override
public void onDestroyed(@NonNull String ifaceName) {
- if (VDBG) Log.v(TAG, "Interface was destroyed");
+ if (mDbg) Log.v(TAG, "Interface was destroyed");
awareIsDown();
}
}
@@ -162,7 +162,7 @@
HalDeviceManager.InterfaceAvailableForRequestListener {
@Override
public void onAvailableForRequest() {
- if (VDBG) Log.v(TAG, "Interface is possibly available");
+ if (mDbg) Log.v(TAG, "Interface is possibly available");
tryToGetAware();
}
}
diff --git a/service/java/com/android/server/wifi/aware/WifiAwareServiceImpl.java b/service/java/com/android/server/wifi/aware/WifiAwareServiceImpl.java
index 8990557..27261e0 100644
--- a/service/java/com/android/server/wifi/aware/WifiAwareServiceImpl.java
+++ b/service/java/com/android/server/wifi/aware/WifiAwareServiceImpl.java
@@ -195,7 +195,7 @@
clientId = mNextClientId++;
}
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "connect: uid=" + uid + ", clientId=" + clientId + ", configRequest"
+ configRequest + ", notifyOnIdentityChanged=" + notifyOnIdentityChanged);
}
@@ -203,7 +203,7 @@
IBinder.DeathRecipient dr = new IBinder.DeathRecipient() {
@Override
public void binderDied() {
- if (VDBG) Log.v(TAG, "binderDied: clientId=" + clientId);
+ if (mDbg) Log.v(TAG, "binderDied: clientId=" + clientId);
binder.unlinkToDeath(this, 0);
synchronized (mLock) {
@@ -243,7 +243,7 @@
int uid = getMockableCallingUid();
enforceClientValidity(uid, clientId);
- if (VDBG) Log.v(TAG, "disconnect: uid=" + uid + ", clientId=" + clientId);
+ if (mDbg) Log.v(TAG, "disconnect: uid=" + uid + ", clientId=" + clientId);
if (binder == null) {
throw new IllegalArgumentException("Binder must not be null");
diff --git a/service/java/com/android/server/wifi/aware/WifiAwareStateManager.java b/service/java/com/android/server/wifi/aware/WifiAwareStateManager.java
index 6c7f39b..1dd18ef 100644
--- a/service/java/com/android/server/wifi/aware/WifiAwareStateManager.java
+++ b/service/java/com/android/server/wifi/aware/WifiAwareStateManager.java
@@ -1121,7 +1121,7 @@
WifiAwareNetworkSpecifier networkSpecifier =
(WifiAwareNetworkSpecifier) msg.obj;
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "MESSAGE_TYPE_DATA_PATH_TIMEOUT: networkSpecifier="
+ networkSpecifier);
}
@@ -1775,7 +1775,7 @@
}
private void processTimeout(Message msg) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "processTimeout: msg=" + msg);
}
@@ -1916,7 +1916,7 @@
}
private void processSendMessageTimeout() {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "processSendMessageTimeout: mHostQueuedSendMessages.size()="
+ mHostQueuedSendMessages.size() + ", mFwQueuedSendMessages.size()="
+ mFwQueuedSendMessages.size() + ", mSendQueueBlocked="
@@ -1938,7 +1938,7 @@
long messageEnqueueTime = message.getData().getLong(
MESSAGE_BUNDLE_KEY_SEND_MESSAGE_ENQUEUE_TIME);
if (first || messageEnqueueTime + AWARE_SEND_MESSAGE_TIMEOUT <= currentTime) {
- if (VDBG) {
+ if (mDbg) {
Log.v(TAG, "processSendMessageTimeout: expiring - transactionId="
+ transactionId + ", message=" + message
+ ", due to messageEnqueueTime=" + messageEnqueueTime