From 94e22143de142be61c1a01f65de9366785f2f595 Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Wed, 30 Jul 2014 16:31:24 -0700 Subject: [PATCH] Add logging of Legacy Type info. There are some bugs where getActiveNetworkInfo gives bad data (seemingly) and this will give the backing data in logs. bug:16610051 Change-Id: Iad867485ad78daeb3e88665dcd0fdb0af756a3bf --- .../android/server/ConnectivityService.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 7aa69fdd70..5382489168 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -556,6 +556,19 @@ public class ConnectivityService extends IConnectivityManager.Stub { } } } + + public void dump(IndentingPrintWriter pw) { + for (int type = 0; type < mTypeLists.length; type++) { + if (mTypeLists[type] == null) continue; + pw.print(type + " "); + pw.increaseIndent(); + if (mTypeLists[type].size() == 0) pw.println("none"); + for (NetworkAgentInfo nai : mTypeLists[type]) { + pw.println(nai.name()); + } + pw.decreaseIndent(); + } + } } private LegacyTypeTracker mLegacyTypeTracker = new LegacyTypeTracker(); @@ -1680,6 +1693,13 @@ public class ConnectivityService extends IConnectivityManager.Stub { pw.println(); pw.decreaseIndent(); + pw.println("mActiveDefaultNetwork:" + mActiveDefaultNetwork); + pw.println("mLegacyTypeTracker:"); + pw.increaseIndent(); + mLegacyTypeTracker.dump(pw); + pw.decreaseIndent(); + pw.println(); + synchronized (this) { pw.println("NetworkTranstionWakeLock is currently " + (mNetTransitionWakeLock.isHeld() ? "" : "not ") + "held.");