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

Commit 9e3aecfc authored by Pinyao Ting's avatar Pinyao Ting Committed by Android (Google) Code Review
Browse files

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

parents 2fcbfbf6 a8fe41af

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

+9 −5
Original line number Diff line number Diff line
@@ -1798,11 +1798,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));