Adding log / workaround for flaky testScreenCaptureDisabled test
***
This is picked from master branch and fixed the flakiness of the CTS
test.
***
1. We did add log previously, but we dump the log before
starting the activity. Break down the test into multi steps so that
we can now dump the log right after the activity is started.
And We also dump activity now.
2. The package will be restarted when its instrumentation is ran, that
means the activity launched will be killed when the test to verify
capiblity of taking screenshot. Removed ScreenCaptureDisabledActivity
and reuse SimpleActivity in CtsSimpleApp package instead.
3. Also, try to give another shot after 5 second if the screen
capture still working. This can check whether the flakiness is
caused by insufficient delay.
Bug: 31509470
Change-Id: I08f9c6a764bd7fc022f866b0b405864242575e6e
(cherry picked from commit c598218f80e43220a271bd7045b930b49463cdc7)
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/AndroidManifest.xml
index 744db8f..632899d 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/AndroidManifest.xml
@@ -39,8 +39,6 @@
</intent-filter>
</receiver>
<activity
- android:name="com.android.cts.deviceandprofileowner.ScreenCaptureDisabledActivity" />
- <activity
android:name="com.android.cts.deviceandprofileowner.ExampleIntentReceivingActivity1">
<intent-filter>
<action android:name="com.android.cts.deviceandprofileowner.EXAMPLE_ACTION" />
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ScreenCaptureDisabledActivity.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ScreenCaptureDisabledActivity.java
deleted file mode 100644
index b5b4fdc..0000000
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ScreenCaptureDisabledActivity.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.cts.deviceandprofileowner;
-
-import android.app.Activity;
-import android.content.Intent;
-
-/**
- * Test activity for setScreenCaptureDisabled().
- */
-public class ScreenCaptureDisabledActivity extends Activity {
-
- static final String ACTIVITY_RESUMED =
- "com.android.cts.deviceandprofileowner.ACTIVITY_RESUMED";
-
- @Override
- protected void onResume() {
- super.onResume();
- sendBroadcast(new Intent(ACTIVITY_RESUMED));
- }
-}
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ScreenCaptureDisabledTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ScreenCaptureDisabledTest.java
index e2deaa4..1bc413b 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ScreenCaptureDisabledTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ScreenCaptureDisabledTest.java
@@ -16,16 +16,8 @@
package com.android.cts.deviceandprofileowner;
import android.app.admin.DevicePolicyManager;
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
import android.util.Log;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-
/**
* Tests for {@link DevicePolicyManager#setScreenCaptureDisabled} and
* {@link DevicePolicyManager#getScreenCaptureDisabled} APIs.
@@ -34,66 +26,28 @@
private static final String TAG = "ScreenCaptureDisabledTest";
- private ScreenCaptureBroadcastReceiver mReceiver = new ScreenCaptureBroadcastReceiver();
-
- protected void setUp() throws Exception {
- super.setUp();
- mContext.registerReceiver(mReceiver, new IntentFilter(
- ScreenCaptureDisabledActivity.ACTIVITY_RESUMED));
- }
-
- protected void tearDown() throws Exception {
- mContext.unregisterReceiver(mReceiver);
- super.tearDown();
- }
-
public void testSetScreenCaptureDisabled_false() throws Exception {
mDevicePolicyManager.setScreenCaptureDisabled(ADMIN_RECEIVER_COMPONENT, false);
assertFalse(mDevicePolicyManager.getScreenCaptureDisabled(ADMIN_RECEIVER_COMPONENT));
assertFalse(mDevicePolicyManager.getScreenCaptureDisabled(null /* any admin */));
- startTestActivity();
- assertNotNull(getInstrumentation().getUiAutomation().takeScreenshot());
}
public void testSetScreenCaptureDisabled_true() throws Exception {
mDevicePolicyManager.setScreenCaptureDisabled(ADMIN_RECEIVER_COMPONENT, true);
assertTrue(mDevicePolicyManager.getScreenCaptureDisabled(ADMIN_RECEIVER_COMPONENT));
assertTrue(mDevicePolicyManager.getScreenCaptureDisabled(null /* any admin */));
- startTestActivity();
+ }
+
+ public void testScreenCaptureImpossible() throws Exception {
+ if (getInstrumentation().getUiAutomation().takeScreenshot() != null) {
+ // TODO: Remove this after investigation in b/28995242 is done
+ Log.e(TAG, "testScreenCaptureImpossible: Can capture screenshot, try one more time.");
+ Thread.sleep(5000);
+ }
assertNull(getInstrumentation().getUiAutomation().takeScreenshot());
}
public void testScreenCapturePossible() throws Exception {
assertNotNull(getInstrumentation().getUiAutomation().takeScreenshot());
}
-
- // We need to launch an activity before trying to take a screen shot, because screenshots are
- // only blocked on a per-user basis in the profile owner case depending on the owner of the
- // foreground activity.
- private void startTestActivity() throws Exception {
- Intent launchIntent = new Intent();
- launchIntent.setComponent(new ComponentName(PACKAGE_NAME,
- ScreenCaptureDisabledActivity.class.getName()));
- launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- mContext.startActivity(launchIntent);
- assertTrue(mReceiver.waitForBroadcast());
- Thread.sleep(1000);
- }
-
- private class ScreenCaptureBroadcastReceiver extends BroadcastReceiver {
- private final Semaphore mSemaphore = new Semaphore(0);
-
- @Override
- public void onReceive(Context context, Intent intent) {
- Log.d(TAG, "Broadcast received");
- mSemaphore.release();
- }
-
- public boolean waitForBroadcast() throws Exception {
- if (mSemaphore.tryAcquire(5, TimeUnit.SECONDS)) {
- return true;
- }
- return false;
- }
- }
}
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java
index fe301f1..8999af3 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java
@@ -106,6 +106,7 @@
getDevice().uninstallPackage(INTENT_RECEIVER_PKG);
getDevice().uninstallPackage(INTENT_SENDER_PKG);
getDevice().uninstallPackage(CUSTOMIZATION_APP_PKG);
+ getDevice().uninstallPackage(TEST_APP_PKG);
// Press the HOME key to close any alart dialog that may be shown.
getDevice().executeShellCommand("input keyevent 3");
@@ -288,11 +289,9 @@
// We need to ensure that the policy is deactivated for the device owner case, so making
// sure the second test is run even if the first one fails
try {
- executeDeviceTestMethod(".ScreenCaptureDisabledTest",
- "testSetScreenCaptureDisabled_true");
+ setScreenCaptureDisabled(mUserId, true);
} finally {
- executeDeviceTestMethod(".ScreenCaptureDisabledTest",
- "testSetScreenCaptureDisabled_false");
+ setScreenCaptureDisabled(mUserId, false);
}
}
@@ -617,4 +616,40 @@
assertTrue("Command was expected to succeed " + commandOutput,
commandOutput.contains("Status: ok"));
}
+
+ /**
+ * Start SimpleActivity synchronously in a particular user.
+ */
+ protected void startScreenCaptureDisabledActivity(int userId) throws Exception {
+ installAppAsUser(TEST_APP_APK, userId);
+ String command = "am start -W --user " + userId + " " + TEST_APP_PKG + "/"
+ + TEST_APP_PKG + ".SimpleActivity";
+ getDevice().executeShellCommand(command);
+ }
+
+ // TODO: Remove this after investigation in b/28995242 is done
+ // So we can check which one is the top window / activity.
+ private void runDumpsysWindow() throws Exception {
+ String command = "dumpsys window displays";
+ CLog.d("Output for command " + command + ": " + getDevice().executeShellCommand(command));
+ command = "dumpsys window policy";
+ CLog.d("Output for command " + command + ": " + getDevice().executeShellCommand(command));
+ command = "dumpsys activity a";
+ CLog.d("Output for command " + command + ": " + getDevice().executeShellCommand(command));
+ }
+
+ protected void setScreenCaptureDisabled(int userId, boolean disabled) throws Exception {
+ String testMethodName = disabled
+ ? "testSetScreenCaptureDisabled_true"
+ : "testSetScreenCaptureDisabled_false";
+ executeDeviceTestMethod(".ScreenCaptureDisabledTest", testMethodName);
+ startScreenCaptureDisabledActivity(userId);
+ // [b/28995242], dump windows to make sure the top window is
+ // ScreenCaptureDisabledActivity.
+ runDumpsysWindow();
+ testMethodName = disabled
+ ? "testScreenCaptureImpossible"
+ : "testScreenCapturePossible";
+ executeDeviceTestMethod(".ScreenCaptureDisabledTest", testMethodName);
+ }
}
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTest.java
index b467aed..afc4e34 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTest.java
@@ -73,29 +73,13 @@
if (!mHasFeature) {
return;
}
- runDumpsysWindow();
- try {
- executeDeviceTestMethod(".ScreenCaptureDisabledTest",
- "testSetScreenCaptureDisabled_true");
- // start the ScreenCaptureDisabledActivity in the parent
- installAppAsUser(DEVICE_ADMIN_APK, mParentUserId);
- String command = "am start -W --user " + mParentUserId + " " + DEVICE_ADMIN_PKG + "/"
- + DEVICE_ADMIN_PKG + ".ScreenCaptureDisabledActivity";
- getDevice().executeShellCommand(command);
- executeDeviceTestMethod(".ScreenCaptureDisabledTest", "testScreenCapturePossible");
- } catch (AssertionError e) {
- runDumpsysWindow();
- CLog.e("testScreenCaptureDisabled_allowedPrimaryUser failed", e);
- fail("testScreenCaptureDisabled_allowedPrimaryUser failed");
- }
- }
+ // disable screen capture in profile
+ setScreenCaptureDisabled(mUserId, true);
- // TODO: Remove this after investigation in b/28995242 is done
- private void runDumpsysWindow() throws Exception {
- String command = "dumpsys window displays";
- CLog.d("Output for command " + command + ": " + getDevice().executeShellCommand(command));
- command = "dumpsys window policy";
- CLog.d("Output for command " + command + ": " + getDevice().executeShellCommand(command));
+ // start the ScreenCaptureDisabledActivity in the parent
+ installAppAsUser(DEVICE_ADMIN_APK, mParentUserId);
+ startScreenCaptureDisabledActivity(mParentUserId);
+ executeDeviceTestMethod(".ScreenCaptureDisabledTest", "testScreenCapturePossible");
}
@Override
