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

Merge "Fixes NPE when calling getPackage on a null shortcut"

Browse Source
This commit is contained in:
Mehdi Alizadeh
2020-02-06 00:09:11 +00:00
committed by Android (Google) Code Review
parent 3d35344faa 15c855f91d
commit 6d5c82ed04
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/ShortcutService.java
View File

@@ -1985,7 +1985,6 @@ public class ShortcutService extends IShortcutService.Stub {
// Verify if caller is the shortcut owner, only if caller doesn't have ACCESS_SHORTCUTS.
verifyShortcutInfoPackage(callingPackage, shortcut);
}
final String shortcutPackage = shortcut.getPackage();
final boolean ret;
synchronized (mLock) {
@@ -1999,6 +1998,7 @@ public class ShortcutService extends IShortcutService.Stub {
// someone already), then we just replace the existing one with this new one,
// and then proceed the rest of the process.
if (shortcut != null) {
final String shortcutPackage = shortcut.getPackage();
final ShortcutPackage ps = getPackageShortcutsForPublisherLocked(
shortcutPackage, userId);
final String id = shortcut.getId();