From 6eec2a8bf517487ab8445812dc1559bc7ad5b173 Mon Sep 17 00:00:00 2001
From: San Mehat <san@google.com>
Date: Wed, 17 Feb 2010 09:03:29 -0800
Subject: [PATCH] NativeDaemonConnector: Improve bad list IPC diagnostics

Signed-off-by: San Mehat <san@google.com>
---
 .../java/com/android/server/NativeDaemonConnector.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/services/java/com/android/server/NativeDaemonConnector.java b/services/java/com/android/server/NativeDaemonConnector.java
index cf083c04f5..ceae973199 100644
--- a/services/java/com/android/server/NativeDaemonConnector.java
+++ b/services/java/com/android/server/NativeDaemonConnector.java
@@ -259,8 +259,12 @@ final class NativeDaemonConnector implements Runnable {
                     rdata[idx++] = line.substring(tok[0].length() + 1);
                 } else if (code == NativeDaemonConnector.ResponseCode.CommandOkay) {
                     if (LOCAL_LOGD) Log.d(TAG, String.format("List terminated with {%s}", line));
-                    if (i != rsp.size()) {
-                        Log.w(TAG, String.format("Recv'd %d lines after list term", (rsp.size()-i)));
+                    int last = rsp.size() -1;
+                    if (i != last) {
+                        Log.w(TAG, String.format("Recv'd %d lines after end of list {%s}", (last-i), cmd));
+                        for (int j = i; j <= last ; j++) {
+                            Log.w(TAG, String.format("ExtraData <%s>", rsp.get(i)));
+                        }
                     }
                     return rdata;
                 } else {