From 4d8959489d6b4123340dd2113044548b37d1b370 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Tue, 12 Jul 2016 13:36:02 -0700 Subject: Fix issue #30013670: Phone AP crash when testing VT call Intent categories may be null. Change-Id: Ic2e0438460741b264ddbfe77d2a14973f9af7d95 --- services/core/java/com/android/server/am/AppErrors.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java index 49106f42044e..03843d11a62e 100644 --- a/services/core/java/com/android/server/am/AppErrors.java +++ b/services/core/java/com/android/server/am/AppErrors.java @@ -58,6 +58,7 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; +import java.util.Set; import java.util.concurrent.Semaphore; import static com.android.server.Watchdog.NATIVE_STACKS_OF_INTEREST; @@ -386,8 +387,8 @@ class AppErrors { } catch (IllegalArgumentException e) { // Hmm, that didn't work, app might have crashed before creating a // recents entry. Let's see if we have a safe-to-restart intent. - if (task.intent.getCategories().contains( - Intent.CATEGORY_LAUNCHER)) { + final Set cats = task.intent.getCategories(); + if (cats != null && cats.contains(Intent.CATEGORY_LAUNCHER)) { mService.startActivityInPackage(task.mCallingUid, task.mCallingPackage, task.intent, null, null, null, 0, 0, -- cgit v1.2.3-59-g8ed1b