commit f93a49422ba1516492a29f0563285d06d079404e
author Jean-Baptiste Queru <jbq@google.com> Tue Oct 12 13:57:11 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 12 13:57:11 2010 -0700
tree 36b2212b819b45708aa25090a7a9e5a711dd652d
parent 76275ac1c53585a374b5e5f1834631fca9392dd8
parent e90cc3ba6c6ccd383f31b539367c2cccea278fed

am e90cc3ba: resolved conflicts for merge of 35e79e32 to gingerbread-plus-aosp

Merge commit 'e90cc3ba6c6ccd383f31b539367c2cccea278fed'

* commit 'e90cc3ba6c6ccd383f31b539367c2cccea278fed':
  Replaced /sdcard with Environment.getExternalStorageDirectory()

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index f81a9bf..989ee25 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -60,6 +60,7 @@
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Environment;
 import android.os.Handler;
 import android.os.Parcelable;
 import android.os.SystemClock;
@@ -263,7 +264,8 @@
         mAppWidgetHost.startListening();
 
         if (PROFILE_STARTUP) {
-            android.os.Debug.startMethodTracing("/sdcard/launcher");
+            android.os.Debug.startMethodTracing(
+                    Environment.getExternalStorageDirectory() + "/launcher");
         }
 
         loadHotseats();