From a3b0e3f0d8319cc0afe5c023ee1578cc8f146486 Mon Sep 17 00:00:00 2001 From: Bryce Lee Date: Wed, 17 May 2017 16:45:36 -0700 Subject: [PATCH] Remove all activities that do not successfully launch. We previously were only removing activities that launched with a fatal result code. Activities that do not start due to a non-fatal error should also be removed. Change-Id: I0b38eaaab7e38ed314c6022705170def38e10436 Fixes: 38021882 Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testLockTask_deviceOwnerUser --- services/core/java/com/android/server/am/ActivityStarter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index a2eec5c4bfae0..c57fc96e4534e 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -956,7 +956,7 @@ class ActivityStarter { // If we are not able to proceed, disassociate the activity from the task. Leaving an // activity in an incomplete state can lead to issues, such as performing operations // without a window container. - if (ActivityManager.isStartResultFatalError(result) + if (!ActivityManager.isStartResultSuccessful(result) && mStartActivity.getTask() != null) { mStartActivity.getTask().removeActivity(mStartActivity); }