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

Merge "Ignore malformed shortcuts" into tm-dev am: 9bce00406b am: 3adfd73383 am: f150b49092

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

Change-Id: I360e30018586c5a34c37cca19cc026c91fcd7cd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-10-04 20:06:16 +00:00
committed by Automerger Merge Worker
parent ae03aa5400 f150b49092
commit ead1761cfc
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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));