commit a9ab7cdb948d370aaebbeee8beed4ae05f62c9f2
author Brett Chabot <brettchabot@android.com> Tue Oct 12 17:14:14 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 12 17:14:14 2010 -0700
tree dfa2f76711fb17e3a8cb5f41bfd19d3fb214176a
parent ded4f97c0b481a567fd66ad325680e9c5a973f57
parent b3555f63287271e675ae7b2967e6ed0ef3e0e6f4

am b3555f63: Merge "CTS host logging fixes." into froyo

Merge commit 'b3555f63287271e675ae7b2967e6ed0ef3e0e6f4' into froyo

* commit 'b3555f63287271e675ae7b2967e6ed0ef3e0e6f4':
  CTS host logging fixes.

tools/host/src/com/android/cts/DeviceManager.java

diff --git a/tools/host/src/com/android/cts/DeviceManager.java b/tools/host/src/com/android/cts/DeviceManager.java
index 528036e..c164ac1 100644
--- a/tools/host/src/com/android/cts/DeviceManager.java
+++ b/tools/host/src/com/android/cts/DeviceManager.java
@@ -218,7 +218,7 @@
                     try {
                         Thread.sleep(100);
                     } catch (InterruptedException e) {
-                        Log.e("", e);
+                        Log.d("polling for device sync service interrupted");
                     }
                 }
                 CUIOutputStream.println("Device(" + mDevice + ") connected");

tools/host/src/com/android/cts/Log.java

diff --git a/tools/host/src/com/android/cts/Log.java b/tools/host/src/com/android/cts/Log.java
index 9ee99c8..4c6e2c8 100644
--- a/tools/host/src/com/android/cts/Log.java
+++ b/tools/host/src/com/android/cts/Log.java
@@ -73,7 +73,7 @@
         if (!HostConfig.DEBUG) {
             CUIOutputStream.println(ERROR_PREFIX + msg);
             if (e != null) {
-                CUIOutputStream.println(e.getMessage());
+                CUIOutputStream.println(e.toString());
             }
             return;
         }

tools/host/src/com/android/cts/TestDevice.java

diff --git a/tools/host/src/com/android/cts/TestDevice.java b/tools/host/src/com/android/cts/TestDevice.java
index 9c82af1..49e32d4 100644
--- a/tools/host/src/com/android/cts/TestDevice.java
+++ b/tools/host/src/com/android/cts/TestDevice.java
@@ -1673,7 +1673,8 @@
                 try {
                     mDevice.executeShellCommand(cmd, receiver);
                 } catch (IOException e) {
-                    Log.e("", e);
+                    Log.e(String.format("Failed to execute shell command %s on device %s", cmd,
+                            mDevice.getSerialNumber()), e);
                 }
             }
         }.start();

tools/host/src/com/android/cts/TestPackage.java

diff --git a/tools/host/src/com/android/cts/TestPackage.java b/tools/host/src/com/android/cts/TestPackage.java
index db1e449..f98628b 100644
--- a/tools/host/src/com/android/cts/TestPackage.java
+++ b/tools/host/src/com/android/cts/TestPackage.java
@@ -641,7 +641,7 @@
             CUIOutputStream.println("Test stopped.");
             mTestThread.join();
         } catch (InterruptedException e) {
-            Log.e("", e);
+            Log.d("test thread interrupted");
         }
     }
 
@@ -753,14 +753,14 @@
                 try {
                     wait();
                 } catch (InterruptedException e) {
-                    Log.e("", e);
+                    Log.d("interrupted while waiting for package action complete");
                 }
             }
         }
         try {
             Thread.sleep(HostConfig.Ints.postInstallWaitMs.value());
         } catch (InterruptedException e) {
-            Log.e("", e);
+            Log.d("sleeping after package action complete interrupted");
         }
         Log.d("Leave waitPackageActionComplete()");
     }