Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa055e7f authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

Merge \"Fix issue #30013670: Phone AP crash when testing VT call\" into nyc-mr1-dev 

am: ab1b52a0

Change-Id: I8c707c615ce3e74cd51db321581c0e7e123c0d95
parents 0359337b ab1b52a0

services/core/java/com/android/server/am/AppErrors.java

+3 −2
Original line number Diff line number Diff line
@@ -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<String> 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,