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

Commit 5238a70b authored by Pinyao Ting's avatar Pinyao Ting
Browse files

Ignore malformed shortcuts 

After an app publishes a shortcut that contains malformed intent, the
system can be stuck in boot-loop due to uncaught exception caused by
parsing the malformed intent.

This CL ignores that particular malformed entry. Since shortcuts are
constantly writes back into the xml from system memory, the malformed
entry will be removed from the xml the next time system persists
shortcuts from memory to file system.

Bug: 246540168
Test: manual
Change-Id: I9492fcbd499ab2792c1d08884e3af394c5a4c79f
parent 1140d5bb

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

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