Merge "CTS: Change patch cwd"
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index f192dae..ee9e0f3 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -2060,6 +2060,8 @@
<meta-data android:name="test_category" android:value="@string/test_category_other" />
<meta-data android:name="test_required_features"
android:value="android.software.app_widgets" />
+ <meta-data android:name="test_excluded_features"
+ android:value="android.hardware.type.automotive" />
</activity>
<activity android:name=".deskclock.DeskClockTestsActivity"
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index c6ed7f6..781bd18 100755
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -3049,17 +3049,21 @@
<string name="enterprise_privacy_default_apps">Default apps</string>
<string name="enterprise_privacy_default_apps_info">
Please do the following:\n
- 1) Press the Reset button.\n
- 2) Press the Open Settings button.\n
- 3) In the screen that opens, verify that you are not told that your administrator set any default apps.\n
- 4) Use the Back button to return to this page.\n
- 5) Press the Set Default Apps button.\n
+ 1) When a default browser is set, you must clear it by step (2), (3) and (4).\n
+ 2) Confirm default browser by "Settings > Apps & notifications > Default apps > Browser app".\n
+ 3) Tap default browser app in the "Settings > Apps & notifications > App info".\n
+ 4) Tap "Open by default" and Tap "CLEAR DEFAULTS"\n
+ 5) Press the Reset button.\n
6) Press the Open Settings button.\n
- 7) In the screen that opens, verify that you are now told that your administrator has set 7 default apps.\n
- 8) Tap on that information. Verify that a list of default apps shows, with 7 elements in it.\n
- 9) Verify that each element shows the CTS Verifier is the default app.\n
- 10) Use the Back button to return to this page.\n
- 11) Press the Reset button.
+ 7) In the screen that opens, verify that you are not told that your administrator set any default apps.\n
+ 8) Use the Back button to return to this page.\n
+ 9) Press the Set Default Apps button.\n
+ 10) Press the Open Settings button.\n
+ 11) In the screen that opens, verify that you are now told that your administrator has set 7 default apps.\n
+ 12) Tap on that information. Verify that a list of default apps shows, with 7 elements in it.\n
+ 13) Verify that each element shows the CTS Verifier is the default app.\n
+ 14) Use the Back button to return to this page.\n
+ 15) Press the Reset button.
</string>
<string name="enterprise_privacy_set_default_apps">Set Default Apps</string>
<string name="enterprise_privacy_default_ime">Default keyboard</string>
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BluetoothToggleActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BluetoothToggleActivity.java
index 7106e7b..d3b1866 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BluetoothToggleActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BluetoothToggleActivity.java
@@ -87,7 +87,7 @@
}
private void enableBluetooth() {
- mDisablingDialog.hide();
+ mDisablingDialog.dismiss();
mToggleButton.setEnabled(false);
Intent intent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
startActivityForResult(intent, START_ENABLE_BLUETOOTH_REQUEST);
@@ -109,7 +109,7 @@
mDisablingDialog.show();
mToggleButton.setEnabled(false);
if (!mBluetoothAdapter.disable()) {
- mDisablingDialog.hide();
+ mDisablingDialog.dismiss();
mToggleButton.setEnabled(true);
new AlertDialog.Builder(this)
.setIcon(android.R.drawable.ic_dialog_alert)
@@ -139,7 +139,7 @@
}
if (BluetoothAdapter.STATE_OFF == newState) {
- mDisablingDialog.hide();
+ mDisablingDialog.dismiss();
mToggleButton.setEnabled(true);
}
diff --git a/tests/tests/location/src/android/location/cts/GnssTtffTests.java b/tests/tests/location/src/android/location/cts/GnssTtffTests.java
index 8b2b62b..335de07 100644
--- a/tests/tests/location/src/android/location/cts/GnssTtffTests.java
+++ b/tests/tests/location/src/android/location/cts/GnssTtffTests.java
@@ -21,7 +21,7 @@
private static final int AIDING_DATA_RESET_DELAY_SECS = 10;
// Threshold values
private static final int TTFF_HOT_TH_SECS = 5;
- private static final int TTFF_WITH_WIFI_CELLUAR_WARM_TH_SECS = 7;
+ private static final int TTFF_WITH_WIFI_CELLUAR_WARM_TH_SECS = 10;
// The worst case we saw in the Nexus 6p device is 15sec,
// adding 20% margin to the threshold
private static final int TTFF_WITH_WIFI_ONLY_WARM_TH_SECS = 18;