Fix onStart/onCreate race in instrumentation.
- Fix calling start() too early. (Before arguments were parsed.)
- Log more if platform query fails.
Bug: 20949263
Change-Id: I9755a4b89430d507bc1a7376ad7c8440c8358746
diff --git a/android/package/src/com/drawelements/deqp/platformutil/DeqpPlatformCapabilityQueryInstrumentation.java b/android/package/src/com/drawelements/deqp/platformutil/DeqpPlatformCapabilityQueryInstrumentation.java
index 04e3c1c..0328700 100644
--- a/android/package/src/com/drawelements/deqp/platformutil/DeqpPlatformCapabilityQueryInstrumentation.java
+++ b/android/package/src/com/drawelements/deqp/platformutil/DeqpPlatformCapabilityQueryInstrumentation.java
@@ -24,7 +24,6 @@
package com.drawelements.deqp.platformutil;
import android.app.Instrumentation;
-
import android.os.Bundle;
public class DeqpPlatformCapabilityQueryInstrumentation extends Instrumentation
@@ -45,10 +44,11 @@
@Override
public void onCreate (Bundle arguments) {
super.onCreate(arguments);
- start();
m_queryType = arguments.getString("deqpQueryType");
m_cmdLine = arguments.getString("deqpCmdLine");
+
+ start();
}
@Override
@@ -66,6 +66,8 @@
{
resultInfo = new Bundle();
resultInfo.putString("Error", "unknown query");
+ resultInfo.putString("QueryType", m_queryType);
+ resultInfo.putString("CmdLine", m_cmdLine);
resultCode = 2;
}
}
diff --git a/android/package/src/com/drawelements/deqp/testercore/DeqpInstrumentation.java b/android/package/src/com/drawelements/deqp/testercore/DeqpInstrumentation.java
index f104310..b9a9b4e 100644
--- a/android/package/src/com/drawelements/deqp/testercore/DeqpInstrumentation.java
+++ b/android/package/src/com/drawelements/deqp/testercore/DeqpInstrumentation.java
@@ -44,7 +44,6 @@
@Override
public void onCreate (Bundle arguments) {
super.onCreate(arguments);
- start();
m_cmdLine = arguments.getString("deqpCmdLine");
m_logFileName = arguments.getString("deqpLogFilename");
@@ -64,6 +63,8 @@
}
else
m_logData = false;
+
+ start();
}
@Override
