summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Shan Emily Lau <yslau@google.com>2009-10-19 15:04:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-19 15:04:46 -0700
commit61c10fd17897182c993ea9e81e43bd28ba6b119e (patch)
treeb67730a68e4c4179b556014e016a988f5cc1014f
parent9c9b0b5ae21f5c749944189fdfefb5978e58341a (diff)
parent7c176f507491ec32166417d87caf27e2766df91f (diff)
downloadpackages_apps_LegacyCamera-61c10fd17897182c993ea9e81e43bd28ba6b119e.zip
packages_apps_LegacyCamera-61c10fd17897182c993ea9e81e43bd28ba6b119e.tar.gz
packages_apps_LegacyCamera-61c10fd17897182c993ea9e81e43bd28ba6b119e.tar.bz2
am 7c176f50: Insert the wait time before collecting the last memory usage for image capture.
Merge commit '7c176f507491ec32166417d87caf27e2766df91f' into eclair-mr2 * commit '7c176f507491ec32166417d87caf27e2766df91f': Insert the wait time before collecting the last memory usage for image capture.
-rwxr-xr-xtests/src/com/android/camera/stress/ImageCapture.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/src/com/android/camera/stress/ImageCapture.java b/tests/src/com/android/camera/stress/ImageCapture.java
index e5d8679..49e8d41 100755
--- a/tests/src/com/android/camera/stress/ImageCapture.java
+++ b/tests/src/com/android/camera/stress/ImageCapture.java
@@ -156,8 +156,10 @@ public class ImageCapture extends ActivityInstrumentationTestCase2 <Camera> {
}
public boolean validateMemoryResult (int startPid, int startMemory, Writer output) throws Exception {
+ Thread.sleep(20000);
mEndPid = getMediaserverPid();
mEndMemory = getMediaserverVsize();
+ output.write("Start Memory = " + startMemory + "\n");
Log.v(TAG, "End memory :" + mEndMemory);
//Write the total memory different into the output file
output.write("The total diff = " + (mEndMemory - startMemory));