Merge "ComponentName null check MUST proceed before creating ComponentKey." into ub-launcher3-calgary-polish

This commit is contained in:
Hyunyoung Song authored and Android (Google) Code Review committed 2016-08-31 18:30:00 +00:00
commit c8b997a21c
1 file changed
+4
+4
View File
@@ -4171,6 +4171,10 @@ public class Launcher extends Activity
return Collections.EMPTY_LIST;
}
ComponentName component = info.getTargetComponent();
if (component == null) {
return Collections.EMPTY_LIST;
}
List<String> ids = mDeepShortcutMap.get(new ComponentKey(component, info.user));
return ids == null ? Collections.EMPTY_LIST : ids;
}