PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Additional logs to track down missing workspace screen. (Bug 11683562)" into jb-ub-now-jolly-elf

Browse Source
This commit is contained in:
Winson Chung
2013-11-15 21:27:34 +00:00
committed by Android (Google) Code Review
parent 28b690ab8e 9f9f00bca6
commit 603d19a333
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/LauncherModel.java
+16
View File
@@ -1616,6 +1616,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;
@@ -1634,6 +1637,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();
@@ -1950,6 +1955,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);
@@ -1966,6 +1975,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<Long> unusedScreens = new ArrayList<Long>(sBgWorkspaceScreens);
@@ -1979,6 +1991,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);
}