diff options
author | Artem Shvadskiy <ashvadskiy@cyngn.com> | 2016-01-13 11:51:55 -0800 |
---|---|---|
committer | Artem Shvadskiy <ashvadskiy@cyngn.com> | 2016-01-13 11:51:55 -0800 |
commit | 68226b79c50f8c726785286dbf80c44dda123ffb (patch) | |
tree | 8f3c2e80832e49c9d085d22945d057570185df0b /src/com/android/launcher3/FolderIcon.java | |
parent | 3c30f3ec6006c429e8751c0d0dfe7631fb161005 (diff) | |
download | android_packages_apps_Trebuchet-staging/remote-folder.tar.gz android_packages_apps_Trebuchet-staging/remote-folder.tar.bz2 android_packages_apps_Trebuchet-staging/remote-folder.zip |
Fix a crash when moving from overlay to non-overlay installation.staging/remote-folder
Change-Id: Ia41f230078333e1ac67c360a6a4030550380e522
Diffstat (limited to 'src/com/android/launcher3/FolderIcon.java')
-rw-r--r-- | src/com/android/launcher3/FolderIcon.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java index a166b1819..c9f7556c1 100644 --- a/src/com/android/launcher3/FolderIcon.java +++ b/src/com/android/launcher3/FolderIcon.java @@ -173,6 +173,10 @@ public class FolderIcon extends FrameLayout implements FolderListener { Folder folder; if (folderInfo.isRemote()) { folder = launcher.getRemoteFolderManager().createRemoteFolder(icon, launcher.getDragLayer()); + if (folder == null) { + LauncherModel.deleteItemFromDatabase(launcher, folderInfo); + return null; + } } else { folder = Folder.fromXml(launcher, launcher.getDragLayer()); } |