From 7a61361724aeba9de7d809bef7d0b0ea113cc6d1 Mon Sep 17 00:00:00 2001
From: Hugo Benichi <hugobenichi@google.com>
Date: Wed, 19 Oct 2016 13:48:40 +0900
Subject: [PATCH] DO NOT MERGE: Add IP conn metrics to dumpsys and bug reports

Test: manually created a bug report and inspected content.

(cherry picked from commit 51d14cb60793a9a073b8a29ff7875bb518cd7d54)

(cherry picked from commit 5635c270a1bda538181daa260902a59030f084e6)

Change-Id: I612b4ab9431633758d3a7048966c267d20cdfcbe
---
 .../com/android/server/connectivity/IpConnectivityMetrics.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java b/services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java
index 76c3528856fd1..18490e1b40a34 100644
--- a/services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java
+++ b/services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java
@@ -232,6 +232,7 @@ final public class IpConnectivityMetrics extends SystemService {
         static final String CMD_FLUSH   = "flush";
         static final String CMD_LIST    = "list";
         static final String CMD_STATS   = "stats";
+        static final String CMD_DUMPSYS = "-a"; // dumpsys.cpp dumps services with "-a" as arguments
         static final String CMD_DEFAULT = CMD_STATS;
 
         @Override
@@ -249,6 +250,8 @@ final public class IpConnectivityMetrics extends SystemService {
                 case CMD_FLUSH:
                     cmdFlush(fd, pw, args);
                     return;
+                case CMD_DUMPSYS:
+                    // Fallthrough to CMD_LIST when dumpsys.cpp dumps services states (bug reports)
                 case CMD_LIST:
                     cmdList(fd, pw, args);
                     return;