Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94f3527c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Do Not Merge] Ignore malformed shortcuts" into sc-v2-dev

parents 5d5a7ffd 849dde06

services/core/java/com/android/server/pm/ShortcutPackage.java

+9 −4
Original line number Diff line number Diff line
@@ -2049,10 +2049,15 @@ class ShortcutPackage extends ShortcutPackageItem { 


                        continue;

                    case TAG_SHORTCUT:

                        try {

                            final ShortcutInfo si = parseShortcut(parser, packageName,

                                    shortcutUser.getUserId(), fromBackup);

                            // Don't use addShortcut(), we don't need to save the icon.

                            ret.mShortcuts.put(si.getId(), si);

                        } catch (Exception e) {

                            // b/246540168 malformed shortcuts should be ignored

                            Slog.e(TAG, "Failed parsing shortcut.", e);

                        }

                        continue;

                    case TAG_SHARE_TARGET:

                        ret.mShareTargets.add(ShareTargetInfo.loadFromXml(parser));