diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-10-04 00:59:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-10-04 00:59:35 +0000 |
| commit | 1b4c92dceed1b4af85d656971ebfc7c0bbb42ad8 (patch) | |
| tree | 3e4bae8dc904bb002fbb3bb405faf0499ac1dac6 | |
| parent | 98210db2757ed7d2a4c8ffa4f55d94ef0637f28e (diff) | |
| parent | 884c14604f454eac540570b2b7c7579c51b40337 (diff) | |
| download | base-1b4c92dceed1b4af85d656971ebfc7c0bbb42ad8.tar.gz | |
Merge changes from topic "presubmit-am-a10436ba523c443696b70308db2adac6" into sc-mainline-prod
* changes:
[automerge] [Do Not Merge] Ignore malformed shortcuts 2p: 36338a3152
[Do Not Merge] Ignore malformed shortcuts
| -rw-r--r-- | services/core/java/com/android/server/pm/ShortcutPackage.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java index b4bd086af272..3506fd9be15d 100644 --- a/services/core/java/com/android/server/pm/ShortcutPackage.java +++ b/services/core/java/com/android/server/pm/ShortcutPackage.java @@ -1967,10 +1967,15 @@ class ShortcutPackage extends ShortcutPackageItem { continue; case TAG_SHORTCUT: - 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); + 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)); |