From 08404a959849d7acf4d436c1a4873948f618209b Mon Sep 17 00:00:00 2001
From: Michal Karpinski <mkarpinski@google.com>
Date: Thu, 15 Nov 2018 17:46:00 +0000
Subject: [PATCH] Fix NPE in LauncherAppsService.shouldShowHiddenApp()

Bug: 119553859
Change-Id: Ia5d701e6bfb786346072be21938996e6c645339c
---
 .../core/java/com/android/server/pm/LauncherAppsService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java
index 275f3dcdb6d21..b4903817f787d 100644
--- a/services/core/java/com/android/server/pm/LauncherAppsService.java
+++ b/services/core/java/com/android/server/pm/LauncherAppsService.java
@@ -362,7 +362,7 @@ public class LauncherAppsService extends SystemService {
         }
 
         private static boolean shouldShowHiddenApp(ApplicationInfo appInfo) {
-            if (appInfo.isSystemApp() || appInfo.isUpdatedSystemApp()) {
+            if (appInfo == null || appInfo.isSystemApp() || appInfo.isUpdatedSystemApp()) {
                 return false;
             }
             return true;