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/Launcher.java | |
parent | 3c30f3ec6006c429e8751c0d0dfe7631fb161005 (diff) | |
download | android_packages_apps_Trebuchet-68226b79c50f8c726785286dbf80c44dda123ffb.tar.gz android_packages_apps_Trebuchet-68226b79c50f8c726785286dbf80c44dda123ffb.tar.bz2 android_packages_apps_Trebuchet-68226b79c50f8c726785286dbf80c44dda123ffb.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/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 6618c75a6..43da26152 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -4948,9 +4948,11 @@ public class Launcher extends Activity final FolderIcon newFolder = FolderIcon.fromXml(R.layout.folder_icon, this, (ViewGroup) workspace.getChildAt(workspace.getCurrentPage()), (FolderInfo) item, mIconCache); - newFolder.setTextVisible(!mHideIconLabels); - workspace.addInScreenFromBind(newFolder, item.container, item.screenId, item.cellX, - item.cellY, 1, 1); + if (newFolder != null) { + newFolder.setTextVisible(!mHideIconLabels); + workspace.addInScreenFromBind(newFolder, item.container, item.screenId, item.cellX, + item.cellY, 1, 1); + } break; default: throw new RuntimeException("Invalid Item Type"); |