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

Commit 1b4c92dc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-a10436ba523c443696b70308db2adac6" into sc-mainline-prod 

* changes:
  [automerge] [Do Not Merge] Ignore malformed shortcuts 2p: 36338a31
  [Do Not Merge] Ignore malformed shortcuts
parents 98210db2 884c1460

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

+9 −4
Original line number Diff line number Diff line
@@ -1967,10 +1967,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));