Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Do Not Merge] Ignore malformed shortcuts" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-10-03 20:23:07 +00:00
committed by Android (Google) Code Review
parent 2663e8aa43 9b0dd514d2
commit 8a2baf4e16
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/pm/ShortcutPackage.java
View File

@@ -1629,11 +1629,15 @@ class ShortcutPackage extends ShortcutPackageItem {
continue; continue;
case TAG_SHORTCUT: case TAG_SHORTCUT:
final ShortcutInfo si = parseShortcut(parser, packageName, try {
shortcutUser.getUserId(), fromBackup); final ShortcutInfo si = parseShortcut(parser, packageName,
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));