Merge "Dump active notifications in netpolicy." into main (c2876726) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -4090,6 +4090,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		}
		fout.decreaseIndent();

		fout.println();
		fout.println("Admin restricted uids for metered data:");
		fout.increaseIndent();
		size = mMeteredRestrictedUids.size();
		@@ -4099,6 +4100,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		}
		fout.decreaseIndent();

		fout.println();
		fout.println("Network to interfaces:");
		fout.increaseIndent();
		for (int i = 0; i < mNetworkToIfaces.size(); ++i) {
		@@ -4107,6 +4109,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		}
		fout.decreaseIndent();

		fout.println();
		fout.print("Active notifications: ");
		fout.println(mActiveNotifs);

		fout.println();
		mStatLogger.dump(fout);

		@@ -6672,7 +6678,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		* Build unique tag that identifies an active {@link NetworkPolicy}
		* notification of a specific type, like {@link #TYPE_LIMIT}.
		*/
		private String buildNotificationTag(NetworkPolicy policy, int type) {
		private static String buildNotificationTag(NetworkPolicy policy, int type) {
		return TAG + ":" + policy.template.hashCode() + ":" + type;
		}

		@@ -6683,5 +6689,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		public int getId() {
		return mId;
		}

		@Override
		public String toString() {
		return mTag;
		}
		}
		}