diff options
| -rw-r--r-- | src/com/android/launcher3/LauncherAppState.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherBackupAgent.java | 16 |
2 files changed, 17 insertions, 3 deletions
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java index 7da1c2af7..8b34ffbe0 100644 --- a/src/com/android/launcher3/LauncherAppState.java +++ b/src/com/android/launcher3/LauncherAppState.java @@ -54,6 +54,10 @@ public class LauncherAppState { return INSTANCE; } + public static LauncherAppState getInstanceNoCreate() { + return INSTANCE; + } + public Context getContext() { return sContext; } diff --git a/src/com/android/launcher3/LauncherBackupAgent.java b/src/com/android/launcher3/LauncherBackupAgent.java index f29bb1fad..f40238cec 100644 --- a/src/com/android/launcher3/LauncherBackupAgent.java +++ b/src/com/android/launcher3/LauncherBackupAgent.java @@ -408,8 +408,13 @@ public class LauncherBackupAgent extends BackupAgent { private void backupIcons(Journal in, BackupDataOutput data, Journal out, ArrayList<Key> keys) throws IOException { // persist icons that haven't been persisted yet + final LauncherAppState app = LauncherAppState.getInstanceNoCreate(); + if (app == null) { + dataChanged(this); // try again later + if (DEBUG) Log.d(TAG, "Launcher is not initialized, delaying icon backup"); + return; + } final ContentResolver cr = getContentResolver(); - final LauncherAppState app = LauncherAppState.getInstance(); final IconCache iconCache = app.getIconCache(); final int dpi = getResources().getDisplayMetrics().densityDpi; @@ -520,10 +525,15 @@ public class LauncherBackupAgent extends BackupAgent { private void backupWidgets(Journal in, BackupDataOutput data, Journal out, ArrayList<Key> keys) throws IOException { // persist static widget info that hasn't been persisted yet + final LauncherAppState appState = LauncherAppState.getInstanceNoCreate(); + if (appState == null) { + dataChanged(this); // try again later + if (DEBUG) Log.d(TAG, "Launcher is not initialized, delaying widget backup"); + return; + } final ContentResolver cr = getContentResolver(); - final PagedViewCellLayout widgetSpacingLayout = new PagedViewCellLayout(this); final WidgetPreviewLoader previewLoader = new WidgetPreviewLoader(this); - final LauncherAppState appState = LauncherAppState.getInstance(); + final PagedViewCellLayout widgetSpacingLayout = new PagedViewCellLayout(this); final IconCache iconCache = appState.getIconCache(); final int dpi = getResources().getDisplayMetrics().densityDpi; final DeviceProfile profile = appState.getDynamicGrid().getDeviceProfile(); |