commit e90cc3ba6c6ccd383f31b539367c2cccea278fed
author Jean-Baptiste Queru <jbq@google.com> Mon Oct 11 14:44:10 2010 -0700
committer Jean-Baptiste Queru <jbq@google.com> Mon Oct 11 14:44:10 2010 -0700
tree c5e43b158779f49d8b5d108274e707ce4ca0a5c3
parent 700889f504ef134ab307d95b6bfbbb426ea730e3
parent 35e79e32808456a7f5f21126ed2fa7badf8dc0bc

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

Change-Id: I039355b9d5852436c8352efc5a85590e5f2bc080

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 9626a2e..96934e8 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -48,6 +48,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;
@@ -230,7 +231,8 @@
         mAppWidgetHost.startListening();
 
         if (PROFILE_STARTUP) {
-            android.os.Debug.startMethodTracing("/sdcard/launcher");
+            android.os.Debug.startMethodTracing(
+                    Environment.getExternalStorageDirectory() + "/launcher");
         }
 
         loadHotseats();