am 9ad8d36a: am cb82bc97: Merge "Fixing a typo which caused some tests to not generate xml." into klp-dev
* commit '9ad8d36ad6958b5d59a9eef9fcbbc7cd7bc8041d':
Fixing a typo which caused some tests to not generate xml.
diff --git a/libs/commonutil/src/com/android/cts/util/TimeoutReq.java b/libs/commonutil/src/com/android/cts/util/TimeoutReq.java
index 943c3ce..144cd33 100644
--- a/libs/commonutil/src/com/android/cts/util/TimeoutReq.java
+++ b/libs/commonutil/src/com/android/cts/util/TimeoutReq.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.cts.util;
+package com.android.cts.util;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/suite/cts/deviceTests/browserbench/src/com/android/cts/browser/BrowserBenchTest.java b/suite/cts/deviceTests/browserbench/src/com/android/cts/browser/BrowserBenchTest.java
index b2f2309..997f730 100644
--- a/suite/cts/deviceTests/browserbench/src/com/android/cts/browser/BrowserBenchTest.java
+++ b/suite/cts/deviceTests/browserbench/src/com/android/cts/browser/BrowserBenchTest.java
@@ -17,7 +17,6 @@
package com.android.cts.browser;
import android.content.Intent;
-import android.cts.util.TimeoutReq;
import android.cts.util.WatchDog;
import android.net.Uri;
import android.provider.Browser;
@@ -28,6 +27,7 @@
import com.android.cts.util.ResultType;
import com.android.cts.util.ResultUnit;
import com.android.cts.util.Stat;
+import com.android.cts.util.TimeoutReq;
import java.net.URLDecoder;
import java.util.LinkedHashMap;
diff --git a/suite/cts/deviceTests/filesystemperf/src/com/android/cts/filesystemperf/AlmostFullTest.java b/suite/cts/deviceTests/filesystemperf/src/com/android/cts/filesystemperf/AlmostFullTest.java
index 1f65e57..ab81f16 100644
--- a/suite/cts/deviceTests/filesystemperf/src/com/android/cts/filesystemperf/AlmostFullTest.java
+++ b/suite/cts/deviceTests/filesystemperf/src/com/android/cts/filesystemperf/AlmostFullTest.java
@@ -16,12 +16,13 @@
package com.android.cts.filesystemperf;
-import android.cts.util.TimeoutReq;
import android.util.Log;
import android.cts.util.CtsAndroidTestCase;
import android.cts.util.SystemUtil;
+import com.android.cts.util.TimeoutReq;
+
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/suite/cts/deviceTests/filesystemperf/src/com/android/cts/filesystemperf/RandomRWTest.java b/suite/cts/deviceTests/filesystemperf/src/com/android/cts/filesystemperf/RandomRWTest.java
index 93d5396..6ad927b 100644
--- a/suite/cts/deviceTests/filesystemperf/src/com/android/cts/filesystemperf/RandomRWTest.java
+++ b/suite/cts/deviceTests/filesystemperf/src/com/android/cts/filesystemperf/RandomRWTest.java
@@ -16,10 +16,8 @@
package com.android.cts.filesystemperf;
-import android.cts.util.TimeoutReq;
-
import android.cts.util.CtsAndroidTestCase;
-
+import com.android.cts.util.TimeoutReq;
public class RandomRWTest extends CtsAndroidTestCase {
private static final String DIR_RANDOM_WR = "RANDOM_WR";
diff --git a/suite/cts/deviceTests/filesystemperf/src/com/android/cts/filesystemperf/SequentialRWTest.java b/suite/cts/deviceTests/filesystemperf/src/com/android/cts/filesystemperf/SequentialRWTest.java
index 6f1f9cd..d369ce8 100644
--- a/suite/cts/deviceTests/filesystemperf/src/com/android/cts/filesystemperf/SequentialRWTest.java
+++ b/suite/cts/deviceTests/filesystemperf/src/com/android/cts/filesystemperf/SequentialRWTest.java
@@ -16,14 +16,14 @@
package com.android.cts.filesystemperf;
-import android.cts.util.TimeoutReq;
+import android.cts.util.CtsAndroidTestCase;
import com.android.cts.util.MeasureRun;
import com.android.cts.util.MeasureTime;
import com.android.cts.util.ResultType;
import com.android.cts.util.ResultUnit;
-import android.cts.util.CtsAndroidTestCase;
import com.android.cts.util.ReportLog;
import com.android.cts.util.Stat;
+import com.android.cts.util.TimeoutReq;
import java.io.File;
import java.io.FileInputStream;
diff --git a/suite/cts/deviceTests/opengl/src/com/android/cts/opengl/primitive/GLPrimitiveBenchmark.java b/suite/cts/deviceTests/opengl/src/com/android/cts/opengl/primitive/GLPrimitiveBenchmark.java
index 2e7efbe..6c2c87d 100644
--- a/suite/cts/deviceTests/opengl/src/com/android/cts/opengl/primitive/GLPrimitiveBenchmark.java
+++ b/suite/cts/deviceTests/opengl/src/com/android/cts/opengl/primitive/GLPrimitiveBenchmark.java
@@ -19,7 +19,7 @@
import com.android.cts.util.ResultUnit;
import android.content.Intent;
-import android.cts.util.TimeoutReq;
+import com.android.cts.util.TimeoutReq;
/**
* Runs the Primitive OpenGL ES 2.0 Benchmarks.
diff --git a/suite/cts/deviceTests/opengl/src/com/android/cts/opengl/reference/GLReferenceBenchmark.java b/suite/cts/deviceTests/opengl/src/com/android/cts/opengl/reference/GLReferenceBenchmark.java
index 39f6d89..fdea916 100644
--- a/suite/cts/deviceTests/opengl/src/com/android/cts/opengl/reference/GLReferenceBenchmark.java
+++ b/suite/cts/deviceTests/opengl/src/com/android/cts/opengl/reference/GLReferenceBenchmark.java
@@ -18,7 +18,7 @@
import android.cts.util.CtsActivityInstrumentationTestCase2;
import com.android.cts.util.ResultType;
import com.android.cts.util.ResultUnit;
-import android.cts.util.TimeoutReq;
+import com.android.cts.util.TimeoutReq;
import android.content.Intent;
diff --git a/suite/cts/deviceTests/simplecpu/src/com/android/cts/simplecpu/SimpleCpuTest.java b/suite/cts/deviceTests/simplecpu/src/com/android/cts/simplecpu/SimpleCpuTest.java
index 2a1ca3c..7485abe 100644
--- a/suite/cts/deviceTests/simplecpu/src/com/android/cts/simplecpu/SimpleCpuTest.java
+++ b/suite/cts/deviceTests/simplecpu/src/com/android/cts/simplecpu/SimpleCpuTest.java
@@ -16,13 +16,13 @@
package com.android.cts.simplecpu;
-import android.cts.util.TimeoutReq;
import android.util.Log;
import com.android.cts.util.ResultType;
import com.android.cts.util.ResultUnit;
import android.cts.util.CtsAndroidTestCase;
import com.android.cts.util.Stat;
+import com.android.cts.util.TimeoutReq;
/**
* Very simple CPU benchmarking to check the basic capability of CPU.
diff --git a/suite/cts/deviceTests/ui/src/com/android/cts/ui/ScrollingTest.java b/suite/cts/deviceTests/ui/src/com/android/cts/ui/ScrollingTest.java
index 759c421..b5b40e4 100644
--- a/suite/cts/deviceTests/ui/src/com/android/cts/ui/ScrollingTest.java
+++ b/suite/cts/deviceTests/ui/src/com/android/cts/ui/ScrollingTest.java
@@ -15,13 +15,13 @@
*/
package com.android.cts.ui;
-import android.cts.util.TimeoutReq;
import com.android.cts.util.MeasureRun;
import com.android.cts.util.MeasureTime;
import com.android.cts.util.ResultType;
import com.android.cts.util.ResultUnit;
import android.cts.util.CtsActivityInstrumentationTestCase2;
import com.android.cts.util.Stat;
+import com.android.cts.util.TimeoutReq;
import java.io.IOException;
diff --git a/suite/cts/hostTests/uihost/src/com/android/cts/uihost/TaskSwitchingTest.java b/suite/cts/hostTests/uihost/src/com/android/cts/uihost/TaskSwitchingTest.java
index d1c4689..0bfecdc 100644
--- a/suite/cts/hostTests/uihost/src/com/android/cts/uihost/TaskSwitchingTest.java
+++ b/suite/cts/hostTests/uihost/src/com/android/cts/uihost/TaskSwitchingTest.java
@@ -16,13 +16,12 @@
package com.android.cts.uihost;
-import android.cts.util.TimeoutReq;
-
import com.android.cts.tradefed.build.CtsBuildHelper;
import com.android.cts.tradefed.result.CtsReportUtil;
import com.android.cts.tradefed.util.CtsHostStore;
import com.android.cts.tradefed.util.HostReportLog;
import com.android.cts.util.ReportLog;
+import com.android.cts.util.TimeoutReq;
import com.android.ddmlib.Log;
import com.android.ddmlib.Log.LogLevel;
import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
diff --git a/tests/tests/hardware/src/android/hardware/cts/CameraGLTest.java b/tests/tests/hardware/src/android/hardware/cts/CameraGLTest.java
index 788cb60..c1809b8 100644
--- a/tests/tests/hardware/src/android/hardware/cts/CameraGLTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/CameraGLTest.java
@@ -17,7 +17,6 @@
package android.hardware.cts;
import android.content.Context;
-import android.cts.util.TimeoutReq;
import android.graphics.SurfaceTexture;
import android.hardware.Camera;
import android.hardware.Camera.Parameters;
@@ -40,6 +39,7 @@
import android.test.suitebuilder.annotation.LargeTest;
import android.util.Log;
+import com.android.cts.util.TimeoutReq;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/H263QcifLongPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/H263QcifLongPlayerTest.java
index 865dfe7..482aec9 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/H263QcifLongPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/H263QcifLongPlayerTest.java
@@ -16,7 +16,7 @@
package android.mediastress.cts;
-import android.cts.util.TimeoutReq;
+import com.android.cts.util.TimeoutReq;
public class H263QcifLongPlayerTest extends MediaPlayerStressTest {
private final static String VIDEO_PATH_MIDDLE = "bbb_full/176x144/3gp_h263_libfaac/";
diff --git a/tools/cts-java-scanner/src/com/android/cts/javascanner/DocletRunner.java b/tools/cts-java-scanner/src/com/android/cts/javascanner/DocletRunner.java
index 436b609..8c8dd4f 100644
--- a/tools/cts-java-scanner/src/com/android/cts/javascanner/DocletRunner.java
+++ b/tools/cts-java-scanner/src/com/android/cts/javascanner/DocletRunner.java
@@ -70,8 +70,7 @@
sourcePath.add("./libcore/dalvik/src/main/java");
sourcePath.add("./cts/tests/src");
sourcePath.add("./cts/libs/commonutil/src");
- sourcePath.add("./cts/libs/deviceutil//src");
- sourcePath.add("./cts/libs/hostutil/src");
+ sourcePath.add("./cts/libs/deviceutil/src");
sourcePath.add("./frameworks/testing/uiautomator/library/testrunner-src");
sourcePath.add("./frameworks/testing/uiautomator_test_libraries/src");
sourcePath.add(sourceDir.toString());