Merge "Snap for 4624361 from 36609b906e645adea3291fdd0b649e35852e206b to oreo-mr1-cts-release" into oreo-mr1-cts-release
diff --git a/apps/CtsVerifier/res/layout/ca_boot_notify.xml b/apps/CtsVerifier/res/layout/ca_boot_notify.xml
index 262c6ad..52df1f1 100644
--- a/apps/CtsVerifier/res/layout/ca_boot_notify.xml
+++ b/apps/CtsVerifier/res/layout/ca_boot_notify.xml
@@ -47,6 +47,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/caboot_if_not_installed" />
+ <TextView
+ android:id="@+id/need_to_install_cert_instructions"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/cacert_install_cert" />
<Button
android:id="@+id/install"
@@ -55,6 +60,18 @@
android:text="@string/caboot_install_cert" />
<TextView
+ android:id="@+id/remove_screen_lock_description"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/cacert_remove_screen_lock" />
+
+ <Button
+ android:id="@+id/remove_screen_lock"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/caboot_remove_screen_lock" />
+
+ <TextView
android:id="@+id/reboot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index 8c733ad..d95843a 100755
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -1695,10 +1695,11 @@
<string name="caboot_test">CA Cert Notification on Boot test</string>
<string name="caboot_info">This test is to confirm that when the user has installed a trusted credential, the system notifies the user when it boots.</string>
- <string name="caboot_check_cert_installed">Please check here to see whether a certificate is already installed. (If this button does nothing, pass the test and move on.)</string>
+ <string name="caboot_check_cert_installed">Please check here to see whether a certificate is already installed. If this button does nothing, pass the test and move on.</string>
<string name="caboot_check_creds">Check Credentials</string>
- <string name="caboot_if_not_installed">Only if there is no credential currently installed, install one. (If this button does nothing, pass the test and move on.)</string>
+ <string name="caboot_if_not_installed">Only if there is no credential currently installed, install one.</string>
<string name="caboot_install_cert">Install credential</string>
+ <string name="caboot_remove_screen_lock">Remove screen lock</string>
<string name="caboot_reboot_desc">Please reboot the device and return to this test.</string>
<string name="caboot_after_boot">AFTER REBOOTING: Check that there is a notification that the network may be monitored. Opening that notification should show a dialog box giving more information, with a button to check trusted credentials. This should open up the same view of trusted credentials that you get via the "Check credentials" button.</string>
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralAttributesActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralAttributesActivity.java
index 871c2a0..83e68e4 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralAttributesActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralAttributesActivity.java
@@ -170,8 +170,7 @@
} else {
mTestStatusTx.setText("No Peripheral or No Matching Profile.");
}
- // Headset not publicly available, violates CTS Verifier additional equipment guidelines.
- // Allow skipping test. See b/67777923 for details.
- getPassButton().setEnabled(true /*outPass && inPass*/);
+
+ getPassButton().setEnabled(outPass && inPass);
}
}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralButtonsActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralButtonsActivity.java
index 861af28..98a7d18 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralButtonsActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralButtonsActivity.java
@@ -122,9 +122,7 @@
Log.i(TAG, "match:" + match);
getPassButton().setEnabled(match);
} else {
- // Headset not publicly available, violates CTS Verifier additional equipment
- // guidelines. Allow skipping test. See b/67777923 for details.
- getPassButton().setEnabled(true /*false*/);
+ getPassButton().setEnabled(false);
}
}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralPlayActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralPlayActivity.java
index b4b0999..5389afb 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralPlayActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralPlayActivity.java
@@ -50,10 +50,9 @@
//
// USBAudioPeripheralActivity
- // Headset not publicly available, violates CTS Verifier additional equipment guidelines.
- // Allow skipping test. See b/67777923 for details.
+ //
public void updateConnectStatus() {
- getPassButton().setEnabled(true /*mOutputDevInfo != null*/);
+ getPassButton().setEnabled(mOutputDevInfo != null);
}
public class LocalClickListener implements View.OnClickListener {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralRecordActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralRecordActivity.java
index e878c82..f05bc9e 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralRecordActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralRecordActivity.java
@@ -134,10 +134,9 @@
//
// USBAudioPeripheralActivity
- // Headset not publicly available, violates CTS Verifier additional equipment guidelines.
- // Allow skipping test. See b/67777923 for details.
+ //
public void updateConnectStatus() {
- getPassButton().setEnabled(true /*mOutputDevInfo != null*/);
+ getPassButton().setEnabled(mOutputDevInfo != null);
}
public class LocalClickListener implements View.OnClickListener {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/security/CANotifyOnBootActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/security/CANotifyOnBootActivity.java
index 5537b15..a4f63ad 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/security/CANotifyOnBootActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/security/CANotifyOnBootActivity.java
@@ -1,5 +1,6 @@
package com.android.cts.verifier.security;
+import android.app.admin.DevicePolicyManager;
import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.os.Bundle;
@@ -32,6 +33,9 @@
Button installButton = (Button) view.findViewById(R.id.install);
checkCredsButton.setOnClickListener(new OpenTrustedCredentials());
installButton.setOnClickListener(new InstallCert());
+ Button removeScreenLockButton = (Button) view.findViewById(R.id.remove_screen_lock);
+ removeScreenLockButton.setOnClickListener(
+ v -> startActivity(new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD)));
setContentView(view);
diff --git a/tests/autofillservice/src/android/autofillservice/cts/AutoFillServiceTestCase.java b/tests/autofillservice/src/android/autofillservice/cts/AutoFillServiceTestCase.java
index 74e168b..e72d85d 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/AutoFillServiceTestCase.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/AutoFillServiceTestCase.java
@@ -64,6 +64,7 @@
protected final Context mContext;
protected final String mPackageName;
+
/**
* Stores the previous logging level so it's restored after the test.
*/
diff --git a/tests/autofillservice/src/android/autofillservice/cts/CustomDescriptionWithLinkTestCase.java b/tests/autofillservice/src/android/autofillservice/cts/CustomDescriptionWithLinkTestCase.java
index 210fab8..e8b183c 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/CustomDescriptionWithLinkTestCase.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/CustomDescriptionWithLinkTestCase.java
@@ -68,6 +68,7 @@
PostSaveLinkTappedAction.ROTATE_THEN_TAP_BACK_BUTTON);
} finally {
sUiBot.setScreenOrientation(UiBot.PORTRAIT);
+ cleanUpAfterScreenOrientationIsBackToPortrait();
}
}
@@ -84,6 +85,9 @@
protected abstract void saveUiRestoredAfterTappingLinkTest(PostSaveLinkTappedAction type)
throws Exception;
+ protected void cleanUpAfterScreenOrientationIsBackToPortrait() throws Exception {
+ }
+
/**
* Tests scenarios when user taps a link in the custom description, taps back to return to the
* activity with the Save UI, and touch outside the Save UI to dismiss it.
diff --git a/tests/autofillservice/src/android/autofillservice/cts/SimpleSaveActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/SimpleSaveActivityTest.java
index 8e4ec03..24b5e4c 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/SimpleSaveActivityTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/SimpleSaveActivityTest.java
@@ -173,6 +173,7 @@
saveTest(true);
} finally {
sUiBot.setScreenOrientation(UiBot.PORTRAIT);
+ cleanUpAfterScreenOrientationIsBackToPortrait();
}
}
@@ -200,6 +201,9 @@
UiObject2 saveUi = sUiBot.assertSaveShowing(SAVE_DATA_TYPE_GENERIC);
if (rotate) {
+ // After the device rotates, the input field get focus and generate a new session.
+ sReplier.addResponse(CannedFillResponse.NO_RESPONSE);
+
sUiBot.setScreenOrientation(UiBot.LANDSCAPE);
saveUi = sUiBot.assertSaveShowing(SAVE_DATA_TYPE_GENERIC);
}
@@ -493,6 +497,9 @@
// .. then do something to return to previous activity...
switch (type) {
case ROTATE_THEN_TAP_BACK_BUTTON:
+ // After the device rotates, the input field get focus and generate a new session.
+ sReplier.addResponse(CannedFillResponse.NO_RESPONSE);
+
sUiBot.setScreenOrientation(UiBot.LANDSCAPE);
// not breaking on purpose
case TAP_BACK_BUTTON:
@@ -515,6 +522,12 @@
final SaveRequest saveRequest = sReplier.getNextSaveRequest();
assertTextAndValue(findNodeByResourceId(saveRequest.structure, ID_INPUT), "108");
+
+ }
+
+ @Override
+ protected void cleanUpAfterScreenOrientationIsBackToPortrait() throws Exception {
+ sReplier.getNextFillRequest();
}
@Override
