summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorYu Shan Emily Lau <yslau@google.com>2009-11-13 14:55:04 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-13 14:55:04 -0800
commit7d9eda6dea8170f764fa7a23cc04f499d2ef170b (patch)
treeb77fc3c7a250ebe11bc6d7ba940a4fa65068c08b /tests
parentfb4f6c794b282f1a255f5405cf54222acb51d512 (diff)
parent5a717676643985dcd40f9fbf29558c2ec99509c2 (diff)
downloadpackages_apps_LegacyCamera-7d9eda6dea8170f764fa7a23cc04f499d2ef170b.zip
packages_apps_LegacyCamera-7d9eda6dea8170f764fa7a23cc04f499d2ef170b.tar.gz
packages_apps_LegacyCamera-7d9eda6dea8170f764fa7a23cc04f499d2ef170b.tar.bz2
am 5a717676: Re-submit the change and make sure the test target can pick it up.
Merge commit '5a717676643985dcd40f9fbf29558c2ec99509c2' into eclair-mr2 * commit '5a717676643985dcd40f9fbf29558c2ec99509c2': Re-submit the change and make sure the test target can pick it up.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/src/com/android/camera/stress/CameraLatency.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/src/com/android/camera/stress/CameraLatency.java b/tests/src/com/android/camera/stress/CameraLatency.java
index 0c5059f..68e5f1f 100755
--- a/tests/src/com/android/camera/stress/CameraLatency.java
+++ b/tests/src/com/android/camera/stress/CameraLatency.java
@@ -115,7 +115,8 @@ public class CameraLatency extends ActivityInstrumentationTestCase2 <Camera> {
+ mAvgShutterToPictureDisplayedTime + "\n");
out.write("Avg mPictureDisplayedToJpegCallbackTime = "
+ mAvgPictureDisplayedToJpegCallbackTime + "\n");
- out.write("Avg mJpegCallbackToFirstFrameTime = " + mAvgJpegCallbackToFirstFrameTime + "\n");
+ out.write("Avg mJpegCallbackToFirstFrameTime = " +
+ mAvgJpegCallbackToFirstFrameTime + "\n");
out.close();
fstream.close();
} catch (Exception e) {