diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-05-09 21:06:04 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-05-09 21:06:04 +0000 |
commit | 34a2d31f3208c64f6ebf403f8a0cb6ea96461747 (patch) | |
tree | bca629b65bf2277d429dbf21fd4e940c9f3a871d /src/com/android/launcher3/Launcher.java | |
parent | ac6d3a87ae9a31873a34f3eae01979910740ade1 (diff) | |
parent | 713edfce264db7edc409216d5c083f8dd6a7083f (diff) | |
download | android_packages_apps_Trebuchet-34a2d31f3208c64f6ebf403f8a0cb6ea96461747.tar.gz android_packages_apps_Trebuchet-34a2d31f3208c64f6ebf403f8a0cb6ea96461747.tar.bz2 android_packages_apps_Trebuchet-34a2d31f3208c64f6ebf403f8a0cb6ea96461747.zip |
Merge "Adding a utility class for persistant logging." into ub-launcher3-calgary
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index d2d1d02cc..21adcb7e1 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -114,6 +114,7 @@ import com.android.launcher3.logging.UserEventDispatcher; import com.android.launcher3.model.WidgetsModel; import com.android.launcher3.userevent.nano.LauncherLogProto; import com.android.launcher3.util.ComponentKey; +import com.android.launcher3.logging.FileLog; import com.android.launcher3.util.TestingUtils; import com.android.launcher3.util.Thunk; import com.android.launcher3.util.ViewOnDrawExecutor; @@ -123,11 +124,9 @@ import com.android.launcher3.widget.WidgetsContainerView; import java.io.FileDescriptor; import java.io.PrintWriter; -import java.text.DateFormat; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -307,11 +306,6 @@ public class Launcher extends Activity private final ArrayList<Integer> mSynchronouslyBoundPages = new ArrayList<Integer>(); private static final boolean DISABLE_SYNCHRONOUS_BINDING_CURRENT_PAGE = false; - private static final ArrayList<String> sDumpLogs = new ArrayList<String>(); - private static final Date sDateStamp = new Date(); - private static final DateFormat sDateFormat = - DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT); - // We only want to get the SharedPreferences once since it does an FS stat each time we get // it from the context. private SharedPreferences mSharedPrefs; @@ -3979,7 +3973,7 @@ public class Launcher extends Activity // Verify that we own the widget if (appWidgetInfo == null) { - Log.e(TAG, "Removing invalid widget: id=" + item.appWidgetId); + FileLog.e(TAG, "Removing invalid widget: id=" + item.appWidgetId); deleteWidgetInfo(item); return; } @@ -4652,12 +4646,10 @@ public class Launcher extends Activity } } - synchronized (sDumpLogs) { - writer.println(); - writer.println(prefix + "Debug logs"); - for (String log : sDumpLogs) { - writer.println(prefix + " " + log); - } + try { + FileLog.flushAll(writer); + } catch (Exception e) { + // Ignore } if (mLauncherCallbacks != null) { @@ -4665,14 +4657,6 @@ public class Launcher extends Activity } } - public static void addDumpLog(String tag, String log) { - Log.d(tag, log); - synchronized(sDumpLogs) { - sDateStamp.setTime(System.currentTimeMillis()); - sDumpLogs.add(sDateFormat.format(sDateStamp) + ": " + tag + ", " + log); - } - } - public static CustomAppWidget getCustomAppWidget(String name) { return sCustomAppWidgets.get(name); } |