am 35474389: Merge "Add logging of Legacy Type info." into lmp-dev (120d65d4) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/ConnectivityService.java

+20 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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();		private LegacyTypeTracker mLegacyTypeTracker = new LegacyTypeTracker();

	@@ -1680,6 +1693,13 @@ public class ConnectivityService extends IConnectivityManager.Stub {
	pw.println();		pw.println();
	pw.decreaseIndent();		pw.decreaseIndent();

			pw.println("mActiveDefaultNetwork:" + mActiveDefaultNetwork);
			pw.println("mLegacyTypeTracker:");
			pw.increaseIndent();
			mLegacyTypeTracker.dump(pw);
			pw.decreaseIndent();
			pw.println();

	synchronized (this) {		synchronized (this) {
	pw.println("NetworkTranstionWakeLock is currently " +		pw.println("NetworkTranstionWakeLock is currently " +
	(mNetTransitionWakeLock.isHeld() ? "" : "not ") + "held.");		(mNetTransitionWakeLock.isHeld() ? "" : "not ") + "held.");