From 9f9f00bca673ed491e623235314a5c4c22ff28c1 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Fri, 15 Nov 2013 13:27:00 -0800 Subject: Additional logs to track down missing workspace screen. (Bug 11683562) Change-Id: I4f6b3c3ae07e2069bad01940dfce6bdc9cdb0ae0 --- src/com/android/launcher3/LauncherModel.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/com') diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index b89579e69..0c81de24d 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1613,6 +1613,9 @@ public class LauncherModel extends BroadcastReceiver { /** Returns whether this is an upgradge path */ private boolean loadWorkspace() { + // Log to disk + Launcher.addDumpLog(TAG, "11683562 - loadWorkspace()", true); + final long t = DEBUG_LOADERS ? SystemClock.uptimeMillis() : 0; final Context context = mContext; @@ -1631,6 +1634,8 @@ public class LauncherModel extends BroadcastReceiver { // Check if we need to do any upgrade-path logic boolean loadedOldDb = LauncherAppState.getLauncherProvider().justLoadedOldDb(); + // Log to disk + Launcher.addDumpLog(TAG, "11683562 - loadedOldDb: " + loadedOldDb, true); synchronized (sBgLock) { clearSBgDataStructures(); @@ -1947,6 +1952,10 @@ public class LauncherModel extends BroadcastReceiver { } } Collections.sort(sBgWorkspaceScreens); + // Log to disk + Launcher.addDumpLog(TAG, "11683562 - maxScreenId: " + maxScreenId, true); + Launcher.addDumpLog(TAG, "11683562 - sBgWorkspaceScreens: " + + TextUtils.join(", ", sBgWorkspaceScreens), true); LauncherAppState.getLauncherProvider().updateMaxScreenId(maxScreenId); updateWorkspaceScreenOrder(context, sBgWorkspaceScreens); @@ -1963,6 +1972,9 @@ public class LauncherModel extends BroadcastReceiver { for (Integer i : orderedScreens.keySet()) { sBgWorkspaceScreens.add(orderedScreens.get(i)); } + // Log to disk + Launcher.addDumpLog(TAG, "11683562 - sBgWorkspaceScreens: " + + TextUtils.join(", ", sBgWorkspaceScreens), true); // Remove any empty screens ArrayList unusedScreens = new ArrayList(sBgWorkspaceScreens); @@ -1976,6 +1988,10 @@ public class LauncherModel extends BroadcastReceiver { // If there are any empty screens remove them, and update. if (unusedScreens.size() != 0) { + // Log to disk + Launcher.addDumpLog(TAG, "11683562 - unusedScreens (to be removed): " + + TextUtils.join(", ", unusedScreens), true); + sBgWorkspaceScreens.removeAll(unusedScreens); updateWorkspaceScreenOrder(context, sBgWorkspaceScreens); } -- cgit v1.2.3