Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated ManagerService to call Summarizer.summarize() in a separate thread.

Browse Source 
This could potentially take a long time and result in ANR.

Change-Id: Ib8b246e627e841217b68c955d92c97801e93d923
This commit is contained in:
Maksymilian Osowski
2010-09-17 15:10:18 +01:00
parent b6a2364eba
commit 9893d96d12
2 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tests/DumpRenderTree2/src/com/android/dumprendertree2/ManagerService.java
View File

@@ -39,6 +39,7 @@ public class ManagerService extends Service {
private static final String LOG_TAG = "ManagerService";
private static final int MSG_CRASH_TIMEOUT_EXPIRED = 0;
private static final int MSG_SUMMARIZER_DONE = 1;
private static final int CRASH_TIMEOUT_MS = 20 * 1000;
@@ -86,30 +87,42 @@ public class ManagerService extends Service {
break;
case MSG_CURRENT_TEST_CRASHED:
mCrashMessagesHandler.removeMessages(MSG_CRASH_TIMEOUT_EXPIRED);
mInternalMessagesHandler.removeMessages(MSG_CRASH_TIMEOUT_EXPIRED);
onTestCrashed();
break;
case MSG_ALL_TESTS_FINISHED:
mSummarizer.setTestsRelativePath(mAllTestsRelativePath);
mSummarizer.summarize();
Intent intent = new Intent(ManagerService.this, TestsListActivity.class);
intent.setAction(Intent.ACTION_SHUTDOWN);
/** This flag is needed because we send the intent from the service */
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
break;
/** We run it in a separate thread to avoid ANR */
new Thread() {
@Override
public void run() {
mSummarizer.setTestsRelativePath(mAllTestsRelativePath);
Message msg = Message.obtain(mInternalMessagesHandler,
MSG_SUMMARIZER_DONE);
mSummarizer.summarize(msg);
}
}.start();
}
}
};
private Messenger mMessenger = new Messenger(mIncomingHandler);
private Handler mCrashMessagesHandler = new Handler() {
private Handler mInternalMessagesHandler = new Handler() {
@Override
public void handleMessage(Message msg) {
if (msg.what == MSG_CRASH_TIMEOUT_EXPIRED) {
onTestCrashed();
switch (msg.what) {
case MSG_CRASH_TIMEOUT_EXPIRED:
onTestCrashed();
break;
case MSG_SUMMARIZER_DONE:
Intent intent = new Intent(ManagerService.this, TestsListActivity.class);
intent.setAction(Intent.ACTION_SHUTDOWN);
/** This flag is needed because we send the intent from the service */
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
break;
}
}
};
@@ -150,7 +163,7 @@ public class ManagerService extends Service {
}
private void onActualResultsObtained(Bundle bundle) {
mCrashMessagesHandler.removeMessages(MSG_CRASH_TIMEOUT_EXPIRED);
mInternalMessagesHandler.removeMessages(MSG_CRASH_TIMEOUT_EXPIRED);
ensureNextTestSetup(bundle.getString("nextTest"), bundle.getInt("testIndex") + 1);
AbstractResult results =
@@ -168,7 +181,7 @@ public class ManagerService extends Service {
mCurrentlyRunningTest = nextTest;
mCurrentlyRunningTestIndex = index;
mCrashMessagesHandler.sendEmptyMessageDelayed(MSG_CRASH_TIMEOUT_EXPIRED, CRASH_TIMEOUT_MS);
mInternalMessagesHandler.sendEmptyMessageDelayed(MSG_CRASH_TIMEOUT_EXPIRED, CRASH_TIMEOUT_MS);
}
/**

4
tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java
View File

@@ -20,6 +20,7 @@ import android.content.res.AssetManager;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Build;
import android.os.Message;
import android.util.DisplayMetrics;
import android.util.Log;
@@ -234,10 +235,11 @@ public class Summarizer {
mTestsRelativePath = testsRelativePath;
}
public void summarize() {
public void summarize(Message onFinishMessage) {
String webKitRevision = getWebKitRevision();
createHtmlDetails(webKitRevision);
createTxtSummary(webKitRevision);
onFinishMessage.sendToTarget();
}
public void reset() {