Merge "Remove obsolete WAR."
diff --git a/java/tests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java b/java/tests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java
index 751c622..3b5e168 100644
--- a/java/tests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java
+++ b/java/tests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java
@@ -55,58 +55,6 @@
Allocation mInPixelsAllocation2;
Allocation mOutPixelsAllocation;
- static class DVFSWorkaround {
- static class spinner extends Thread {
- boolean mRun = true;
- long mNextSleep;
-
- spinner() {
- setPriority(MIN_PRIORITY);
- start();
- }
-
- public void run() {
- while (mRun) {
- Thread.yield();
- synchronized(this) {
- long t = java.lang.System.currentTimeMillis();
- if (t > mNextSleep) {
- try {
- this.wait();
- } catch(InterruptedException e) {
- }
- }
- }
- }
- }
-
- public void go(long t) {
- synchronized(this) {
- mNextSleep = t;
- notifyAll();
- }
- }
- }
-
- spinner s1;
- DVFSWorkaround() {
- s1 = new spinner();
- }
-
- void go() {
- long t = java.lang.System.currentTimeMillis() + 2000;
- s1.go(t);
- }
-
- void destroy() {
- synchronized(this) {
- s1.mRun = false;
- notifyAll();
- }
- }
- }
- DVFSWorkaround mDvfsWar = new DVFSWorkaround();
-
/**
* Define enum type for test names
@@ -577,7 +525,6 @@
}
mDoingBenchmark = true;
- mDvfsWar.go();
mTest.setupBenchmark();
long result = 0;