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

am cdbbab76: Fixing NPE in Workspace.removeItemsByPackageName() (Bug 8942242)

Browse Source 
* commit 'cdbbab76e1e6e2819c16e0c2d3b528cf4ecd48c5':
  Fixing NPE in Workspace.removeItemsByPackageName() (Bug 8942242)
This commit is contained in:
Winson Chung
2013-05-14 11:59:43 -07:00
committed by Android Git Automerger
parent 42e2235780 cdbbab76e1
commit 07381ae4e4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/Workspace.java
+3 -3
View File
@@ -3659,21 +3659,21 @@ public class Workspace extends SmoothPagedView
if (tag instanceof ShortcutInfo) {
ShortcutInfo info = (ShortcutInfo) tag;
ComponentName cn = info.intent.getComponent();
if (packageNames.contains(cn.getPackageName())) {
if ((cn != null) && packageNames.contains(cn.getPackageName())) {
cns.add(cn);
}
} else if (tag instanceof FolderInfo) {
FolderInfo info = (FolderInfo) tag;
for (ShortcutInfo s : info.contents) {
ComponentName cn = s.intent.getComponent();
if (packageNames.contains(cn.getPackageName())) {
if ((cn != null) && packageNames.contains(cn.getPackageName())) {
cns.add(cn);
}
}
} else if (tag instanceof LauncherAppWidgetInfo) {
LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) tag;
ComponentName cn = info.providerName;
if (packageNames.contains(cn.getPackageName())) {
if ((cn != null) && packageNames.contains(cn.getPackageName())) {
cns.add(cn);
}
}