diff options
| author | Dan Sandler <dsandler@android.com> | 2013-12-10 16:05:47 -0500 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2014-06-06 22:54:22 -0700 |
| commit | d5ce881b5458e4d5258de62ead33be56ffa75ebb (patch) | |
| tree | ce63ebd982ff4fc639dd981946bedeb9edaa5d19 /src | |
| parent | 05c27d4b698a71551905a938db23f688ce5ca0e7 (diff) | |
| download | android_packages_apps_Trebuchet-d5ce881b5458e4d5258de62ead33be56ffa75ebb.tar.gz android_packages_apps_Trebuchet-d5ce881b5458e4d5258de62ead33be56ffa75ebb.tar.bz2 android_packages_apps_Trebuchet-d5ce881b5458e4d5258de62ead33be56ffa75ebb.zip | |
Size hotseat data structure appropriately.
Bug: 12070213
Change-Id: I4df2f4bcc71bb4077c62cae91ed844ea8c43d421
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 13 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index c0289e44a..97ac65f0e 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -4757,13 +4757,22 @@ public class Launcher extends Activity } public static void addDumpLog(String tag, String log, boolean debugLog) { + addDumpLog(tag, log, null, debugLog); + } + + public static void addDumpLog(String tag, String log, Exception e, boolean debugLog) { if (debugLog) { - Log.d(tag, log); + if (e != null) { + Log.d(tag, log, e); + } else { + Log.d(tag, log); + } } if (DEBUG_DUMP_LOG) { sDateStamp.setTime(System.currentTimeMillis()); synchronized (sDumpLogs) { - sDumpLogs.add(sDateFormat.format(sDateStamp) + ": " + tag + ", " + log); + sDumpLogs.add(sDateFormat.format(sDateStamp) + ": " + tag + ", " + log + + (e == null ? "" : (", Exception: " + e))); } } } diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 44ea79003..836c08e0e 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1984,7 +1984,7 @@ public class LauncherModel extends BroadcastReceiver { break; } } catch (Exception e) { - Launcher.addDumpLog(TAG, "Desktop items loading interrupted: " + e, true); + Launcher.addDumpLog(TAG, "Desktop items loading interrupted", e, true); } } } finally { |