Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge from open-source master

Browse Source 
Change-Id: I1901177e8a4bd32a707020c581f25f21349ba571
This commit is contained in:
The Android Open Source Project
2010-07-20 10:33:38 -07:00
parent fcff691057 798e2d3d0c
commit ca48433afc
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/os/Debug.java
View File

@@ -94,7 +94,8 @@ public final class Debug
/** /**
* Default trace file path and file * Default trace file path and file
*/ */
private static final String DEFAULT_TRACE_PATH_PREFIX = "/sdcard/"; private static final String DEFAULT_TRACE_PATH_PREFIX =
Environment.getExternalStorageDirectory().getPath() + "/";
private static final String DEFAULT_TRACE_BODY = "dmtrace"; private static final String DEFAULT_TRACE_BODY = "dmtrace";
private static final String DEFAULT_TRACE_EXTENSION = ".trace"; private static final String DEFAULT_TRACE_EXTENSION = ".trace";
private static final String DEFAULT_TRACE_FILE_PATH = private static final String DEFAULT_TRACE_FILE_PATH =

4
core/java/android/provider/Telephony.java
View File

@@ -25,6 +25,7 @@ import android.content.Intent;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SqliteWrapper; import android.database.sqlite.SqliteWrapper;
import android.net.Uri; import android.net.Uri;
import android.os.Environment;
import android.telephony.SmsMessage; import android.telephony.SmsMessage;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Config; import android.util.Config;
@@ -1526,7 +1527,8 @@ public final class Telephony {
* which streams the captured image to the uri. Internally we write the media content * which streams the captured image to the uri. Internally we write the media content
* to this file. It's named '.temp.jpg' so Gallery won't pick it up. * to this file. It's named '.temp.jpg' so Gallery won't pick it up.
*/ */
public static final String SCRAP_FILE_PATH = "/sdcard/mms/scrapSpace/.temp.jpg"; public static final String SCRAP_FILE_PATH =
Environment.getExternalStorageDirectory().getPath() + "/mms/scrapSpace/.temp.jpg";
} }
public static final class Intents { public static final class Intents {

3
core/java/com/android/internal/os/SamplingProfilerIntegration.java
View File

@@ -85,7 +85,8 @@ public class SamplingProfilerIntegration {
pending = true; pending = true;
snapshotWriter.execute(new Runnable() { snapshotWriter.execute(new Runnable() {
public void run() { public void run() {
String dir = "/sdcard/snapshots"; String dir =
Environment.getExternalStorageDirectory().getPath() + "/snapshots";
if (!dirMade) { if (!dirMade) {
new File(dir).mkdirs(); new File(dir).mkdirs();
if (new File(dir).isDirectory()) { if (new File(dir).isDirectory()) {