From 578820dd328fe9a203548810fd4632f6a7a2bc0c Mon Sep 17 00:00:00 2001
From: Mehdi Alizadeh <mett@google.com>
Date: Fri, 29 May 2020 13:06:40 -0700
Subject: [PATCH] Adds null checks to ShortcutManager#getShareTargets()

Bug: 157647326
Test: It builds
Change-Id: I719584cba7863f66aacb4385704d36337152ad1e
---
 services/core/java/com/android/server/pm/ShortcutService.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java
index 3732b479c3a3f..2b5bd6bfda1e8 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");