commit 100e106551af965b2f53a506011a875daffb0274
author Maksymilian Osowski <maxosowski@google.com> Tue Aug 03 08:05:46 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 03 08:05:46 2010 -0700
tree cbf1e407b4985d3b8cfa0b83572b86e6371e7845
parent ef7f9d2458d547df4b47808f19e549eee9af76ce
parent c83712e68642b9816a561916c6ec044509bd6759

Merge "Changed the order of searching for expected result (and added additional location)."

tests/DumpRenderTree2/AndroidManifest.xml

diff --git a/tests/DumpRenderTree2/AndroidManifest.xml b/tests/DumpRenderTree2/AndroidManifest.xml
index 1213674..9f6097a 100644
--- a/tests/DumpRenderTree2/AndroidManifest.xml
+++ b/tests/DumpRenderTree2/AndroidManifest.xml
@@ -41,4 +41,5 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_SDCARD" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
 </manifest>
\ No newline at end of file

tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java

diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java
index 73026bc..fe00a92 100644
--- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java
+++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java
@@ -28,7 +28,9 @@
 import android.os.IBinder;
 import android.os.Message;
 import android.os.Messenger;
+import android.os.PowerManager;
 import android.os.RemoteException;
+import android.os.PowerManager.WakeLock;
 import android.util.Log;
 import android.view.Window;
 import android.webkit.ConsoleMessage;
@@ -103,6 +105,8 @@
     private boolean mCanOpenWindows;
     private boolean mDumpDatabaseCallbacks;
 
+    private WakeLock mScreenDimLock;
+
     /** COMMUNICATION WITH ManagerService */
 
     private Messenger mManagerServiceMessenger;
@@ -239,6 +243,11 @@
         mCurrentTestIndex = intent.getIntExtra(EXTRA_TEST_INDEX, -1);
         mTotalTestCount = mCurrentTestIndex + mTestsList.size();
 
+        PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+        mScreenDimLock = pm.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK
+                | PowerManager.ON_AFTER_RELEASE, "WakeLock in LayoutTester");
+        mScreenDimLock.acquire();
+
         bindService(new Intent(this, ManagerService.class), mServiceConnection,
                 Context.BIND_AUTO_CREATE);
     }
@@ -390,6 +399,8 @@
     }
 
     private void onAllTestsFinished() {
+        mScreenDimLock.release();
+
         try {
             Message serviceMsg =
                     Message.obtain(null, ManagerService.MSG_ALL_TESTS_FINISHED);