Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix TaskStackChangedListenerTest runtime error."

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-09 08:59:48 +00:00
committed by Android (Google) Code Review
parent 5c70eb259b 646f8a9534
commit 99b6143fb2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/tests/wmtests/src/com/android/server/wm/TaskStackChangedListenerTest.java
View File

@@ -52,6 +52,7 @@ import android.view.ViewGroup;
import androidx.test.filters.FlakyTest;
import androidx.test.filters.MediumTest;
import com.android.compatibility.common.util.SystemUtil;
import com.android.internal.annotations.GuardedBy;
import org.junit.After;
@@ -295,7 +296,7 @@ public class TaskStackChangedListenerTest {
final Context context = instrumentation.getContext();
Intent intent = new Intent(context, ActivityInActivityView.class);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
activityView.startActivity(intent);
SystemUtil.runWithShellPermissionIdentity(() -> activityView.startActivity(intent));
waitForCallback(singleTaskDisplayDrawnLatch);
}
@@ -338,7 +339,7 @@ public class TaskStackChangedListenerTest {
final Context context = instrumentation.getContext();
Intent intent = new Intent(context, ActivityInActivityView.class);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
activityView.startActivity(intent);
SystemUtil.runWithShellPermissionIdentity(() -> activityView.startActivity(intent));
waitForCallback(singleTaskDisplayDrawnLatch);
assertEquals(1, singleTaskDisplayEmptyLatch.getCount());
@@ -465,9 +466,9 @@ public class TaskStackChangedListenerTest {
final ActivityMonitor monitor = new ActivityMonitor(activityClass.getName(), null, false);
getInstrumentation().addMonitor(monitor);
final Context context = getInstrumentation().getContext();
context.startActivity(
SystemUtil.runWithShellPermissionIdentity(() -> context.startActivity(
new Intent(context, activityClass).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK),
options.toBundle());
options.toBundle()));
final TestActivity activity = (TestActivity) monitor.waitForActivityWithTimeout(1000);
if (activity == null) {
throw new RuntimeException("Timed out waiting for Activity");