diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-03 02:01:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-03 02:01:47 +0000 |
| commit | 843f071dba2d92ff04494745f98dc2ff7d3025a1 (patch) | |
| tree | 19545430ea350cc73cd86c277f7aeb4875c7eb87 | |
| parent | 99ed6ce7437fd0958a75e9920c2e4145fd44ddef (diff) | |
| parent | 578820dd328fe9a203548810fd4632f6a7a2bc0c (diff) | |
Merge "Adds null checks to ShortcutManager#getShareTargets()" into rvc-dev
| -rw-r--r-- | services/core/java/com/android/server/pm/ShortcutService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java index 3ec139763e80..0c42ff6be520 100644 --- a/services/core/java/com/android/server/pm/ShortcutService.java +++ b/services/core/java/com/android/server/pm/ShortcutService.java @@ -2419,6 +2419,9 @@ public class ShortcutService extends IShortcutService.Stub { @Override public ParceledListSlice<ShortcutManager.ShareShortcutInfo> getShareTargets(String packageName, IntentFilter filter, @UserIdInt int userId) { + Preconditions.checkStringNotEmpty(packageName, "packageName"); + Objects.requireNonNull(filter, "intentFilter"); + verifyCaller(packageName, userId); enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_APP_PREDICTIONS, "getShareTargets"); |