4 files changed, 17 insertions, 1 deletions
diff --git a/src/com/android/tradefed/testtype/suite/ITestSuite.java b/src/com/android/tradefed/testtype/suite/ITestSuite.java
index 45db8cf09..0b4f3f6a7 100644
--- a/src/com/android/tradefed/testtype/suite/ITestSuite.java
+++ b/src/com/android/tradefed/testtype/suite/ITestSuite.java
@@ -508,7 +508,7 @@ public abstract class ITestSuite
     @Override
     public long getRuntimeHint() {
         if (mDirectModule != null) {
-            CLog.e(
+            CLog.d(
                     "    %s: %s",
                     mDirectModule.getId(),
                     TimeUtil.formatElapsedTime(mDirectModule.getRuntimeHint()));
diff --git a/src/com/android/tradefed/testtype/suite/ValidateSuiteConfigHelper.java b/src/com/android/tradefed/testtype/suite/ValidateSuiteConfigHelper.java
index 914037f7e..11701a0b5 100644
--- a/src/com/android/tradefed/testtype/suite/ValidateSuiteConfigHelper.java
+++ b/src/com/android/tradefed/testtype/suite/ValidateSuiteConfigHelper.java
@@ -26,6 +26,8 @@ import com.android.tradefed.result.TextResultReporter;
  */
 public class ValidateSuiteConfigHelper {
 
+    private ValidateSuiteConfigHelper() {}
+
     /**
      * Check that a configuration is properly built to run in a suite.
      *
diff --git a/tests/src/com/android/tradefed/testtype/suite/ITestSuiteTest.java b/tests/src/com/android/tradefed/testtype/suite/ITestSuiteTest.java
index 9eaadf33a..3750c4d02 100644
--- a/tests/src/com/android/tradefed/testtype/suite/ITestSuiteTest.java
+++ b/tests/src/com/android/tradefed/testtype/suite/ITestSuiteTest.java
@@ -386,4 +386,18 @@ public class ITestSuiteTest {
             assertTrue(test instanceof TestSuiteImpl);
         }
     }
+
+    /** Test that after being sharded, ITestSuite shows the module runtime that it holds. */
+    @Test
+    public void testGetRuntimeHint() {
+        // default runtime hint is 0, it is only meant to be used for sharding.
+        assertEquals(0l, mTestSuite.getRuntimeHint());
+        mTestSuite = new TestSuiteImpl(5);
+        Collection<IRemoteTest> tests = mTestSuite.split(3);
+        for (IRemoteTest test : tests) {
+            assertTrue(test instanceof TestSuiteImpl);
+            // once sharded modules from the shard start reporting their runtime.
+            assertEquals(60000l, ((TestSuiteImpl) test).getRuntimeHint());
+        }
+    }
 }
diff --git a/src/com/android/tradefed/testtype/suite/TestSuiteStub.java b/tests/src/com/android/tradefed/testtype/suite/TestSuiteStub.java
index 79f8ee1cc..79f8ee1cc 100644
--- a/src/com/android/tradefed/testtype/suite/TestSuiteStub.java
+++ b/tests/src/com/android/tradefed/testtype/suite/TestSuiteStub.java