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

Merge changes from topic "presubmit-am-a10436ba523c443696b70308db2adac6" into sc-qpr1-dev

Browse Source 
* changes:
  [automerge] [Do Not Merge] Ignore malformed shortcuts 2p: 36338a3152
  [Do Not Merge] Ignore malformed shortcuts
This commit is contained in:
TreeHugger Robot
2022-10-04 00:59:35 +00:00
committed by Android (Google) Code Review
parent 9f6e9f9f96 a536efe21e
commit d7133ae51e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1967,10 +1967,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,
// Don't use addShortcut(), we don't need to save the icon. shortcutUser.getUserId(), fromBackup);
ret.mShortcuts.put(si.getId(), si); // 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; continue;
case TAG_SHARE_TARGET: case TAG_SHARE_TARGET:
ret.mShareTargets.add(ShareTargetInfo.loadFromXml(parser)); ret.mShareTargets.add(ShareTargetInfo.loadFromXml(parser));