summaryrefslogtreecommitdiffstats
path: root/tests/src/com/android
diff options
context:
space:
mode:
authorYu Shan Emily Lau <yslau@google.com>2009-11-09 16:30:50 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-09 16:30:50 -0800
commit87ac6d7c8a1c64402a04b577b907594399f39bc2 (patch)
tree76eaf0cad80e3c151b8548aa8e8d5b1eca7c76e1 /tests/src/com/android
parentd4c9080e1fbc3073e013ef92a620d243872f07f8 (diff)
parentf8fb435dc77fbe364013ca8274ce6e84cd44b737 (diff)
downloadLegacyCamera-87ac6d7c8a1c64402a04b577b907594399f39bc2.zip
LegacyCamera-87ac6d7c8a1c64402a04b577b907594399f39bc2.tar.gz
LegacyCamera-87ac6d7c8a1c64402a04b577b907594399f39bc2.tar.bz2
am f8fb435d: Changed the tag name.
Merge commit 'f8fb435dc77fbe364013ca8274ce6e84cd44b737' into eclair-mr2 * commit 'f8fb435dc77fbe364013ca8274ce6e84cd44b737': Changed the tag name.
Diffstat (limited to 'tests/src/com/android')
-rwxr-xr-xtests/src/com/android/camera/stress/ImageCapture.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/src/com/android/camera/stress/ImageCapture.java b/tests/src/com/android/camera/stress/ImageCapture.java
index 49e8d41..6978657 100755
--- a/tests/src/com/android/camera/stress/ImageCapture.java
+++ b/tests/src/com/android/camera/stress/ImageCapture.java
@@ -160,6 +160,7 @@ public class ImageCapture extends ActivityInstrumentationTestCase2 <Camera> {
mEndPid = getMediaserverPid();
mEndMemory = getMediaserverVsize();
output.write("Start Memory = " + startMemory + "\n");
+ output.write("End Memory = " + mEndMemory + "\n");
Log.v(TAG, "End memory :" + mEndMemory);
//Write the total memory different into the output file
output.write("The total diff = " + (mEndMemory - startMemory));
@@ -192,7 +193,7 @@ public class ImageCapture extends ActivityInstrumentationTestCase2 <Camera> {
output.write("No of loops : " + TOTAL_NUMBER_OF_VIDEOCAPTURE + "\n");
getMemoryWriteToLog(output);
- mOut.write("Video Camera Capture\n");
+ mOut.write("Camera Image Capture\n");
mOut.write("No of loops :" + TOTAL_NUMBER_OF_VIDEOCAPTURE + "\n");
mOut.write("loop: ");
@@ -241,10 +242,10 @@ public class ImageCapture extends ActivityInstrumentationTestCase2 <Camera> {
try {
Writer output = new BufferedWriter(new FileWriter(imageCaptureMemFile, true));
- output.write("Camera Image capture\n");
+ output.write("Camera Video capture\n");
output.write("No of loops : " + TOTAL_NUMBER_OF_VIDEOCAPTURE + "\n");
getMemoryWriteToLog(output);
- mOut.write("Video Camera Capture\n");
+ mOut.write("Camera Video Capture\n");
mOut.write("No of loops :" + TOTAL_NUMBER_OF_VIDEOCAPTURE + "\n");
mOut.write("loop: ");
// Switch to the video mode