drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replaced /sdcard with Environment.getExternalStorageDirectory()"

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2010-07-29 15:01:24 -07:00
committed by Android Code Review
parent f0fa8416e1 8b85dceadf
commit 9150cff64a
10 changed files with 57 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/DumpRenderTree/src/com/android/dumprendertree/FileList.java
View File

@ -31,6 +31,7 @@ import android.view.View;
import android.widget.ListView;
import android.widget.SimpleAdapter;
import android.os.Bundle;
import android.os.Environment;
public abstract class FileList extends ListActivity
@ -179,10 +180,9 @@ public abstract class FileList extends ListActivity
getListView().setSelection(mFocusIndex);
}
protected void setupPath()
{
mPath = "/sdcard/android/layout_tests";
mBaseLength = mPath.length();
protected void setupPath() {
mPath = Environment.getExternalStorageDirectory() + "/android/layout_tests";
mBaseLength = mPath.length();
}
protected String mPath;

17
tests/DumpRenderTree/src/com/android/dumprendertree/FsUtils.java
View File

@ -18,6 +18,7 @@ package com.android.dumprendertree;
import com.android.dumprendertree.forwarder.ForwardService;
import android.os.Environment;
import android.util.Log;
import java.io.BufferedOutputStream;
@ -32,11 +33,17 @@ import java.util.regex.Pattern;
public class FsUtils {
private static final String LOGTAG = "FsUtils";
static final String HTTP_TESTS_PREFIX = "/sdcard/android/layout_tests/http/tests/";
static final String HTTPS_TESTS_PREFIX = "/sdcard/android/layout_tests/http/tests/ssl/";
static final String HTTP_LOCAL_TESTS_PREFIX = "/sdcard/android/layout_tests/http/tests/local/";
static final String HTTP_MEDIA_TESTS_PREFIX = "/sdcard/android/layout_tests/http/tests/media/";
static final String HTTP_WML_TESTS_PREFIX = "/sdcard/android/layout_tests/http/tests/wml/";
static final String EXTERNAL_DIR = Environment.getExternalStorageDirectory().toString();
static final String HTTP_TESTS_PREFIX =
EXTERNAL_DIR + "/android/layout_tests/http/tests/";
static final String HTTPS_TESTS_PREFIX =
EXTERNAL_DIR + "/android/layout_tests/http/tests/ssl/";
static final String HTTP_LOCAL_TESTS_PREFIX =
EXTERNAL_DIR + "/android/layout_tests/http/tests/local/";
static final String HTTP_MEDIA_TESTS_PREFIX =
EXTERNAL_DIR + "/android/layout_tests/http/tests/media/";
static final String HTTP_WML_TESTS_PREFIX =
EXTERNAL_DIR + "/android/layout_tests/http/tests/wml/";
private FsUtils() {
//no creation of instances

22
tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java
View File

@ -18,12 +18,12 @@ package com.android.dumprendertree;
import com.android.dumprendertree.TestShellActivity.DumpDataType;
import com.android.dumprendertree.forwarder.AdbUtils;
import com.android.dumprendertree.forwarder.ForwardServer;
import com.android.dumprendertree.forwarder.ForwardService;
import android.app.Instrumentation;
import android.content.Intent;
import android.os.Bundle;
import android.os.Environment;
import android.test.ActivityInstrumentationTestCase2;
import android.util.Log;
@ -92,10 +92,11 @@ class MyTestRecorder {
public MyTestRecorder(boolean resume) {
try {
File resultsPassedFile = new File("/sdcard/layout_tests_passed.txt");
File resultsFailedFile = new File("/sdcard/layout_tests_failed.txt");
File resultsIgnoreResultFile = new File("/sdcard/layout_tests_ignored.txt");
File noExpectedResultFile = new File("/sdcard/layout_tests_nontext.txt");
File externalDir = Environment.getExternalStorageDirectory();
File resultsPassedFile = new File(externalDir, "layout_tests_passed.txt");
File resultsFailedFile = new File(externalDir, "layout_tests_failed.txt");
File resultsIgnoreResultFile = new File(externalDir, "layout_tests_ignored.txt");
File noExpectedResultFile = new File(externalDir, "layout_tests_nontext.txt");
mBufferedOutputPassedStream =
new BufferedOutputStream(new FileOutputStream(resultsPassedFile, resume));
@ -128,11 +129,12 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh
private static final String LOGTAG = "LayoutTests";
static final int DEFAULT_TIMEOUT_IN_MILLIS = 5000;
static final String LAYOUT_TESTS_ROOT = "/sdcard/android/layout_tests/";
static final String LAYOUT_TESTS_RESULT_DIR = "/sdcard/android/layout_tests_results/";
static final String ANDROID_EXPECTED_RESULT_DIR = "/sdcard/android/expected_results/";
static final String LAYOUT_TESTS_LIST_FILE = "/sdcard/android/layout_tests_list.txt";
static final String TEST_STATUS_FILE = "/sdcard/android/running_test.txt";
static final String EXTERNAL_DIR = Environment.getExternalStorageDirectory().toString();
static final String LAYOUT_TESTS_ROOT = EXTERNAL_DIR + "/android/layout_tests/";
static final String LAYOUT_TESTS_RESULT_DIR = EXTERNAL_DIR + "/android/layout_tests_results/";
static final String ANDROID_EXPECTED_RESULT_DIR = EXTERNAL_DIR + "/android/expected_results/";
static final String LAYOUT_TESTS_LIST_FILE = EXTERNAL_DIR + "/android/layout_tests_list.txt";
static final String TEST_STATUS_FILE = EXTERNAL_DIR + "/android/running_test.txt";
static final String LAYOUT_TESTS_RESULTS_REFERENCE_FILES[] = {
"results/layout_tests_passed.txt",
"results/layout_tests_failed.txt",

4
tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java
View File

@ -22,6 +22,7 @@ import android.app.Instrumentation;
import android.content.Intent;
import android.os.Bundle;
import android.os.Debug;
import android.os.Environment;
import android.os.Process;
import android.test.ActivityInstrumentationTestCase2;
import android.util.Log;
@ -35,7 +36,8 @@ import java.io.PrintStream;
public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShellActivity> {
private final static String LOGTAG = "LoadTest";
private final static String LOAD_TEST_RESULT = "/sdcard/load_test_result.txt";
private final static String LOAD_TEST_RESULT =
Environment.getExternalStorageDirectory() + "/load_test_result.txt";
private boolean mFinished;
static final String LOAD_TEST_RUNNER_FILES[] = {
"run_page_cycler.py"

4
tests/DumpRenderTree/src/com/android/dumprendertree/Menu.java
View File

@ -18,6 +18,7 @@ package com.android.dumprendertree;
import android.content.Intent;
import android.os.Bundle;
import android.os.Environment;
import android.util.Log;
import java.io.BufferedOutputStream;
@ -28,7 +29,8 @@ public class Menu extends FileList {
private static final int MENU_START = 0x01;
private static String LOGTAG = "MenuActivity";
static final String LAYOUT_TESTS_LIST_FILE = "/sdcard/android/layout_tests_list.txt";
static final String LAYOUT_TESTS_LIST_FILE =
Environment.getExternalStorageDirectory() + "/android/layout_tests_list.txt";
public void onCreate(Bundle icicle) {
super.onCreate(icicle);

15
tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTest.java
View File

@ -18,6 +18,7 @@ package com.android.dumprendertree;
import android.app.Activity;
import android.content.Intent;
import android.os.Environment;
import android.os.Handler;
import android.os.Message;
import android.test.ActivityInstrumentationTestCase2;
@ -37,10 +38,16 @@ public class ReliabilityTest extends ActivityInstrumentationTestCase2<Reliabilit
private static final String LOGTAG = "ReliabilityTest";
private static final String PKG_NAME = "com.android.dumprendertree";
private static final String TEST_LIST_FILE = "/sdcard/android/reliability_tests_list.txt";
private static final String TEST_STATUS_FILE = "/sdcard/android/reliability_running_test.txt";
private static final String TEST_TIMEOUT_FILE = "/sdcard/android/reliability_timeout_test.txt";
private static final String TEST_LOAD_TIME_FILE = "/sdcard/android/reliability_load_time.txt";
private static final String EXTERNAL_DIR =
Environment.getExternalStorageDirectory().toString();
private static final String TEST_LIST_FILE = EXTERNAL_DIR +
"/android/reliability_tests_list.txt";
private static final String TEST_STATUS_FILE = EXTERNAL_DIR +
"/android/reliability_running_test.txt";
private static final String TEST_TIMEOUT_FILE = EXTERNAL_DIR +
"/android/reliability_timeout_test.txt";
private static final String TEST_LOAD_TIME_FILE = EXTERNAL_DIR +
"/android/reliability_load_time.txt";
private static final String TEST_DONE = "#DONE";
static final String RELIABILITY_TEST_RUNNER_FILES[] = {
"run_reliability_tests.py"

4
tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
View File

@ -30,6 +30,7 @@ import android.graphics.Bitmap.CompressFormat;
import android.graphics.Bitmap.Config;
import android.net.http.SslError;
import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
import android.os.Message;
import android.util.Log;
@ -862,7 +863,8 @@ public class TestShellActivity extends Activity implements LayoutTestController
static final String SAVE_IMAGE = "SaveImage";
static final int DRAW_RUNS = 5;
static final String DRAW_TIME_LOG = "/sdcard/android/page_draw_time.txt";
static final String DRAW_TIME_LOG = Environment.getExternalStorageDirectory() +
"/android/page_draw_time.txt";
private boolean mGeolocationPermissionSet;
private boolean mGeolocationPermission;

4
tests/DumpRenderTree/src/com/android/dumprendertree/forwarder/ForwardService.java
View File

@ -21,6 +21,7 @@ import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import android.os.Environment;
import android.util.Log;
public class ForwardService {
@ -33,7 +34,8 @@ public class ForwardService {
private static final String DEFAULT_TEST_HOST = "android-browser-test.mtv.corp.google.com";
private static final String FORWARD_HOST_CONF = "/sdcard/drt_forward_host.txt";
private static final String FORWARD_HOST_CONF =
Environment.getExternalStorageDirectory() + "/drt_forward_host.txt";
private ForwardService() {
int addr = getForwardHostAddr();

6
tests/LocationTracker/src/com/android/locationtracker/TrackerActivity.java
View File

@ -28,6 +28,7 @@ import android.content.Intent;
import android.database.Cursor;
import android.location.LocationManager;
import android.os.Bundle;
import android.os.Environment;
import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;
@ -210,12 +211,11 @@ public class TrackerActivity extends ListActivity {
}
private String getUniqueFileName(String ext) {
File dir = new File("/sdcard/locationtracker");
File dir = new File(Environment.getExternalStorageDirectory() + "/locationtracker");
if (!dir.exists()) {
dir.mkdir();
}
return "/sdcard/locationtracker/tracking-" +
DateUtils.getCurrentTimestamp() + "." + ext;
return dir + "/tracking-" + DateUtils.getCurrentTimestamp() + "." + ext;
}
private void launchSettings() {

10
tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java
View File

@ -16,24 +16,19 @@
package com.android.statusbartest;
import android.app.ListActivity;
import android.app.PendingIntent;
import android.widget.ArrayAdapter;
import android.view.View;
import android.widget.ListView;
import android.content.Context;
import android.content.ContentResolver;
import android.content.Intent;
import android.app.Notification;
import android.app.NotificationManager;
import android.os.Environment;
import android.os.Vibrator;
import android.os.Bundle;
import android.os.Handler;
import android.util.Log;
import android.net.Uri;
import android.os.SystemClock;
import android.widget.RemoteViews;
import android.widget.TextView;
import android.os.PowerManager;
public class NotificationTestList extends TestActivity
@ -69,7 +64,8 @@ public class NotificationTestList extends TestActivity
pm.goToSleep(SystemClock.uptimeMillis());
Notification n = new Notification();
n.sound = Uri.parse("file:///sdcard/virtual-void.mp3");
n.sound = Uri.parse("file://" + Environment.getExternalStorageDirectory() +
"/virtual-void.mp3");
Log.d(TAG, "n.sound=" + n.sound);
mNM.notify(1, n);