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

Commit 884c1460 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] [Do Not Merge] Ignore malformed shortcuts 2p: 36338a31 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20013777

Bug: 246540168
Change-Id: I26888fc35b26116ebb9a92ccecf7fd25e15c0c55
parents 6342dac5 36338a31

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));