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

Commit ead1761c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ignore malformed shortcuts" into tm-dev am: 9bce0040 am: 3adfd733 am: f150b490 

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



Change-Id: I360e30018586c5a34c37cca19cc026c91fcd7cd2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ae03aa54 f150b490

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

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




                            continue;

                            continue;

                        case TAG_SHORTCUT:

                        case TAG_SHORTCUT:

                            try {

                                final ShortcutInfo si = parseShortcut(parser, packageName,

                                final ShortcutInfo si = parseShortcut(parser, packageName,

                                        shortcutUser.getUserId(), fromBackup);

                                        shortcutUser.getUserId(), fromBackup);

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

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

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

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

                            } catch (Exception e) {

                                // b/246540168 malformed shortcuts should be ignored

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

                            }

                            continue;

                            continue;

                        case TAG_SHARE_TARGET:

                        case TAG_SHARE_TARGET:

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

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