summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2017-02-22 13:11:13 -0800
committergitbuildkicker <android-build@google.com>2017-02-23 10:21:25 -0800
commit198248b19414066de16f268714fb3a4fdd4b7332 (patch)
tree8b252ad1e5a0041f0998d45072f5ac1d8550a01b
parent0569cfe44cb846c705b335b2fa07e9b7ab19a4e3 (diff)
downloadcts-nougat-mr2.2-release.tar.gz
Bug: 35314835 Test: android.server.cts.ActivityManagerPinnedStackTests Change-Id: I76f26668fbf5dc2ffa686ae6a2040ef1a604b4cc (cherry picked from commit 86eda00193f7997e1f7848b0e95f8364734f87a9)
-rw-r--r--hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerPinnedStackTests.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerPinnedStackTests.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerPinnedStackTests.java
index 7a691eccfa9..b99a74871c2 100644
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerPinnedStackTests.java
+++ b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerPinnedStackTests.java
@@ -34,6 +34,8 @@ public class ActivityManagerPinnedStackTests extends ActivityManagerTestBase {
pinnedStackTester(PIP_ACTIVITY, PIP_ACTIVITY, true, false);
}
+ /**
+ * Disabled for b/35314835
public void testAlwaysFocusablePipActivity() throws Exception {
pinnedStackTester(ALWAYS_FOCUSABLE_PIP_ACTIVITY, ALWAYS_FOCUSABLE_PIP_ACTIVITY, true, true);
}
@@ -42,6 +44,7 @@ public class ActivityManagerPinnedStackTests extends ActivityManagerTestBase {
pinnedStackTester(
LAUNCH_INTO_PINNED_STACK_PIP_ACTIVITY, ALWAYS_FOCUSABLE_PIP_ACTIVITY, false, true);
}
+ */
private void pinnedStackTester(String startActivity, String topActivityName,
boolean moveTopToPinnedStack, boolean isFocusable) throws Exception {