am f55e3222: Merge "Fix issue 2622023 Clean up all hardcoded \'/sdcard\' in camera related codes." into kraken

This commit is contained in:
Ray Chen
2010-05-14 11:50:19 -07:00
committed by Android Git Automerger

View File

@@ -19,21 +19,20 @@ package com.android.mediaframeworktest.functional;
import com.android.mediaframeworktest.MediaFrameworkTest; import com.android.mediaframeworktest.MediaFrameworkTest;
import com.android.mediaframeworktest.MediaNames; import com.android.mediaframeworktest.MediaNames;
import java.io.*;
import android.content.Context; import android.content.Context;
import android.hardware.Camera; import android.hardware.Camera;
import android.hardware.Camera.PictureCallback; import android.hardware.Camera.PictureCallback;
import android.hardware.Camera.PreviewCallback; import android.hardware.Camera.PreviewCallback;
import android.hardware.Camera.ShutterCallback; import android.hardware.Camera.ShutterCallback;
import android.os.ConditionVariable;
import android.os.Environment;
import android.os.Looper;
import android.test.ActivityInstrumentationTestCase; import android.test.ActivityInstrumentationTestCase;
import android.test.suitebuilder.annotation.LargeTest;
import android.util.Log; import android.util.Log;
import android.view.SurfaceHolder; import android.view.SurfaceHolder;
import android.os.ConditionVariable; import java.io.*;
import android.os.Looper;
import android.test.suitebuilder.annotation.LargeTest;
/** /**
* Junit / Instrumentation test case for the camera api * Junit / Instrumentation test case for the camera api
@@ -153,7 +152,8 @@ public class CameraTest extends ActivityInstrumentationTestCase<MediaFrameworkTe
try { try {
if (rawData != null) { if (rawData != null) {
int rawDataLength = rawData.length; int rawDataLength = rawData.length;
File rawoutput = new File("/sdcard/test.bmp"); File rawoutput = new File(
Environment.getExternalStorageDirectory().toString(), "/test.bmp");
FileOutputStream outstream = new FileOutputStream(rawoutput); FileOutputStream outstream = new FileOutputStream(rawoutput);
outstream.write(rawData); outstream.write(rawData);
Log.v(TAG, "JpegPictureCallback rawDataLength = " + rawDataLength); Log.v(TAG, "JpegPictureCallback rawDataLength = " + rawDataLength);