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

Fix crash when adding PinShortcutRequestActivityInfo to Folder.

Browse Source 
Bug: 63770450
Change-Id: Ibc7553933a53d8af459628add7644fbaf5820cb0
This commit is contained in:
Jon Miranda
2017-07-17 15:58:36 -07:00
parent 751ea1c10e
commit b24fa30025
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/folder/Folder.java
+8 -3
View File
@@ -1359,8 +1359,11 @@ public class Folder extends AbstractFloatingView implements DragSource, View.OnC
}
mContent.completePendingPageChanges();
if (d.dragInfo instanceof PendingAddShortcutInfo) {
PendingAddShortcutInfo pasi = (PendingAddShortcutInfo) d.dragInfo;
PendingAddShortcutInfo pasi = d.dragInfo instanceof PendingAddShortcutInfo
? (PendingAddShortcutInfo) d.dragInfo : null;
ShortcutInfo pasiSi = pasi != null ? pasi.activityInfo.createShortcutInfo() : null;
if (pasi != null && pasiSi == null) {
// There is no ShortcutInfo, so we have to go through a configuration activity.
pasi.container = mInfo.id;
pasi.rank = mEmptyCellRank;
@@ -1370,7 +1373,9 @@ public class Folder extends AbstractFloatingView implements DragSource, View.OnC
mRearrangeOnClose = true;
} else {
final ShortcutInfo si;
if (d.dragInfo instanceof AppInfo) {
if (pasiSi != null) {
si = pasiSi;
} else if (d.dragInfo instanceof AppInfo) {
// Came from all apps -- make a copy.
si = ((AppInfo) d.dragInfo).makeShortcut();
} else {
src/com/android/launcher3/widget/PendingAddShortcutInfo.java
-1
View File
@@ -15,7 +15,6 @@
*/
package com.android.launcher3.widget;
import com.android.launcher3.LauncherSettings;
import com.android.launcher3.PendingAddItemInfo;
import com.android.launcher3.compat.ShortcutConfigActivityInfo;