Snap for 6379507 from 77bdfd63d0081039ab4e57ed8ae364e6da303726 to mainline-release
Change-Id: I91818c882ad1ceba2de79dc356ef802f163cc022
diff --git a/src/com/android/launcher3/ItemInfo.java b/src/com/android/launcher3/ItemInfo.java
index 8c4e4a0..6f5b941 100644
--- a/src/com/android/launcher3/ItemInfo.java
+++ b/src/com/android/launcher3/ItemInfo.java
@@ -248,6 +248,7 @@
LauncherAtom.ItemInfo.Builder itemBuilder = LauncherAtom.ItemInfo.newBuilder();
itemBuilder.setIsWork(user != Process.myUserHandle());
ComponentName cn = getTargetComponent();
+ if (cn == null) return itemBuilder.build();
switch (itemType) {
case ITEM_TYPE_APPLICATION:
itemBuilder.setApplication(LauncherAtom.Application.newBuilder()
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 3a3de26..7c504a6 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -282,6 +282,7 @@
Rect padding = grid.workspacePadding;
setPadding(padding.left, padding.top, padding.right, padding.bottom);
+ mInsets.set(insets);
if (mWorkspaceFadeInAdjacentScreens) {
// In landscape mode the page spacing is set to the default.