summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2011-12-18 04:06:24 +0059
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2011-12-18 04:06:24 +0059
commit35eb382d1152bf46587773dab30bca9040acf5b5 (patch)
tree4d7d83a4d4ce0adfcae1be2d966482a0f18754a9
parent5ad6d1b02086b6f670628f186a321d55f55dac4c (diff)
downloadbase-linaro_android_4.0.3_pandaboard.tar.gz
MediaFrameworkTest: Fix duplicate onCreate()linaro_android_4.0.3_pandaboard
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java22
1 files changed, 9 insertions, 13 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
index addedc27ddb8..4fc79d23c66d 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
@@ -64,12 +64,20 @@ public class MediaFrameworkTestRunner extends InstrumentationTestRunner {
@Override
public void onCreate (Bundle arguments){
Log.v(TAG, "step into onCreate");
+ super.onCreate(arguments);
+
+ String minCameraFps = (String) arguments.get("min_camera_fps");
+ System.out.print("min_camera_" + minCameraFps);
+
+ if (minCameraFps != null ) {
+ mMinCameraFps = Integer.parseInt(minCameraFps);
+ }
+
String targetDir = (String)arguments.get("targetDir");
if(targetDir != null){
Log.v(TAG, "targetDir="+targetDir);
mTargetDir = targetDir;
}
- super.onCreate(arguments);
Log.v(TAG, "step out onCreate");
}
@@ -150,16 +158,4 @@ public class MediaFrameworkTestRunner extends InstrumentationTestRunner {
public ClassLoader getLoader() {
return MediaFrameworkTestRunner.class.getClassLoader();
}
-
- @Override
- public void onCreate(Bundle icicle) {
- super.onCreate(icicle);
-
- String minCameraFps = (String) icicle.get("min_camera_fps");
- System.out.print("min_camera_" + minCameraFps);
-
- if (minCameraFps != null ) {
- mMinCameraFps = Integer.parseInt(minCameraFps);
- }
- }
}