diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-10-14 20:07:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-14 20:07:32 +0000 |
| commit | 528f44147c5d3093196b69985ca7f9aecd4599a6 (patch) | |
| tree | 387a86fa89de57e08bea3371b76daca1fc301f45 | |
| parent | e3d77b53fe443f16e129a7c9f9d588cea574d97f (diff) | |
| parent | 39e1abc169347150fddd1c7ca9707781b3247f78 (diff) | |
| download | cts-sparse-6905961-L72200000728003604.tar.gz | |
Merge "Snap for 6904889 from 07a02a30471ed9a9bd21ae69d4fc911e1bd6e457 to android11-tests-release" into android11-tests-releasesparse-6905961-L72200000728003604
| -rw-r--r-- | apps/CtsVerifier/AndroidManifest.xml | 846 | ||||
| -rw-r--r-- | tests/tests/net/jni/NativeMultinetworkJni.cpp | 20 | ||||
| -rw-r--r-- | tests/tests/provider/src/android/provider/cts/SettingsPanelTest.java | 3 |
3 files changed, 768 insertions, 101 deletions
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml index 59ea459b482..e5f8f372275 100644 --- a/apps/CtsVerifier/AndroidManifest.xml +++ b/apps/CtsVerifier/AndroidManifest.xml @@ -121,6 +121,8 @@ android:value="android.software.lockscreen_disabled" /> <meta-data android:name="test_required_features" android:value="android.software.device_admin" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".admin.DeviceAdminUninstallTestActivity" @@ -133,6 +135,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_device_admin" /> <meta-data android:name="test_required_features" android:value="android.software.device_admin" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".admin.tapjacking.DeviceAdminTapjackingTestActivity" @@ -145,6 +149,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_device_admin" /> <meta-data android:name="test_required_features" android:value="android.software.device_admin" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <receiver android:name=".admin.tapjacking.EmptyDeviceAdminReceiver" @@ -159,7 +165,10 @@ <activity android:name=".admin.tapjacking.OverlayingActivity" android:theme="@style/OverlayTheme" - android:label="Overlaying Activity"/> + android:label="Overlaying Activity"> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".battery.BatterySaverTestActivity" @@ -171,6 +180,8 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_other" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".forcestop.RecentTaskRemovalTestActivity" @@ -182,6 +193,8 @@ </intent-filter> <meta-data android:name="test_required_configs" android:value="config_has_recents"/> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".companion.CompanionDeviceTestActivity" @@ -194,6 +207,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_features" /> <meta-data android:name="test_required_features" android:value="android.software.companion_device_setup" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- A generic activity for intent based tests. @@ -215,6 +230,8 @@ <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive:android.hardware.type.television:android.software.lockscreen_disabled" /> <meta-data android:name="test_required_features" android:value="android.software.device_admin" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- CTS Verifier Bluetooth Test Top Screen --> @@ -234,6 +251,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -260,6 +279,8 @@ <meta-data android:name="test_excluded_features" android:value="android.software.leanback" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -283,6 +304,8 @@ <meta-data android:name="test_parent" android:value="com.android.cts.verifier.bluetooth.BluetoothTestActivity" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- Support service to ensure HID Device Test succeeds on @@ -310,6 +333,8 @@ <meta-data android:name="test_parent" android:value="com.android.cts.verifier.bluetooth.BluetoothTestActivity" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -335,6 +360,8 @@ android:value="com.android.cts.verifier.bluetooth.BluetoothTestActivity" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -360,6 +387,8 @@ android:value="com.android.cts.verifier.bluetooth.BluetoothTestActivity" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -385,6 +414,8 @@ android:value="com.android.cts.verifier.bluetooth.BluetoothTestActivity" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -410,6 +441,8 @@ android:value="com.android.cts.verifier.bluetooth.BluetoothTestActivity" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -432,6 +465,8 @@ <meta-data android:name="test_parent" android:value="com.android.cts.verifier.bluetooth.BluetoothTestActivity" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -454,11 +489,16 @@ <meta-data android:name="test_parent" android:value="com.android.cts.verifier.bluetooth.BluetoothTestActivity" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".bluetooth.DevicePickerActivity" android:configChanges="keyboardHidden|orientation|screenSize" - android:label="@string/bt_device_picker" /> + android:label="@string/bt_device_picker" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <!-- ***************************************************************************************** @@ -520,6 +560,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth_le" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> @@ -547,6 +589,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth_le" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -577,6 +621,8 @@ <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -637,6 +683,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth_le" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -663,6 +711,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth_le" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -692,6 +742,8 @@ <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -752,6 +804,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth_le" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -778,6 +832,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth_le" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -808,6 +864,8 @@ <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -835,6 +893,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth_le" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -866,6 +926,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth_le" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -892,6 +954,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth_le" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -921,6 +985,8 @@ <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -948,6 +1014,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth_le" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -979,6 +1047,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth_le" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -1005,6 +1075,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth_le" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -1036,6 +1108,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth_le" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -1062,6 +1136,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth_le" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -1093,6 +1169,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth_le" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -1119,6 +1197,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth_le" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -1150,6 +1230,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth_le" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -1176,6 +1258,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth_le" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -1207,6 +1291,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth_le" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -1230,6 +1316,8 @@ <meta-data android:name="test_parent" android:value="com.android.cts.verifier.bluetooth.BleScannerTestActivity" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> @@ -1262,6 +1350,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.bluetooth_le" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- @@ -1285,6 +1375,8 @@ <meta-data android:name="test_parent" android:value="com.android.cts.verifier.bluetooth.BleAdvertiserTestActivity" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".biometrics.BiometricTestList" @@ -1299,6 +1391,8 @@ <meta-data android:name="test_required_features" android:value="android.software.secure_lock_screen" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -1317,6 +1411,8 @@ <meta-data android:name="test_required_features" android:value="android.software.secure_lock_screen" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -1335,6 +1431,8 @@ <meta-data android:name="test_required_features" android:value="android.software.secure_lock_screen" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -1353,6 +1451,8 @@ <meta-data android:name="test_required_features" android:value="android.software.secure_lock_screen" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -1371,6 +1471,8 @@ <meta-data android:name="test_required_features" android:value="android.software.secure_lock_screen" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -1389,6 +1491,8 @@ <meta-data android:name="test_required_features" android:value="android.software.secure_lock_screen" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -1407,6 +1511,8 @@ <meta-data android:name="test_required_features" android:value="android.software.secure_lock_screen" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -1425,6 +1531,8 @@ <meta-data android:name="test_required_features" android:value="android.software.secure_lock_screen" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -1443,6 +1551,8 @@ <meta-data android:name="test_required_features" android:value="android.software.secure_lock_screen" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -1461,6 +1571,8 @@ <meta-data android:name="test_required_features" android:value="android.software.secure_lock_screen" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -1479,6 +1591,8 @@ <meta-data android:name="test_required_features" android:value="android.software.secure_lock_screen" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -1497,6 +1611,8 @@ <meta-data android:name="test_required_features" android:value="android.software.secure_lock_screen" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -1515,6 +1631,8 @@ <meta-data android:name="test_required_features" android:value="android.software.secure_lock_screen" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -1533,6 +1651,8 @@ <meta-data android:name="test_required_features" android:value="android.software.secure_lock_screen" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -1551,6 +1671,8 @@ <meta-data android:name="test_required_features" android:value="android.software.secure_lock_screen" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -1569,6 +1691,8 @@ <meta-data android:name="test_required_features" android:value="android.software.secure_lock_screen" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".security.IdentityCredentialAuthentication" @@ -1583,6 +1707,8 @@ android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch" /> <meta-data android:name="test_required_features" android:value="android.software.secure_lock_screen" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".security.FingerprintBoundKeysTest" @@ -1597,6 +1723,8 @@ android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch" /> <meta-data android:name="test_required_features" android:value="android.hardware.fingerprint:android.software.secure_lock_screen" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".security.ProtectedConfirmationTest" @@ -1607,6 +1735,8 @@ <category android:name="android.cts.intent.category.MANUAL_TEST" /> </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_security" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".security.ScreenLockBoundKeysTest" @@ -1621,6 +1751,8 @@ android:value="android.software.lockscreen_disabled" /> <meta-data android:name="test_required_features" android:value="android.software.device_admin:android.software.secure_lock_screen" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".security.LockConfirmBypassTest" @@ -1635,6 +1767,8 @@ android:value="android.software.lockscreen_disabled" /> <meta-data android:name="test_required_features" android:value="android.software.device_admin:android.software.secure_lock_screen" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".security.SetNewPasswordComplexityTest" @@ -1649,6 +1783,8 @@ android:value="android.software.secure_lock_screen" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive:android.software.lockscreen_disabled" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".streamquality.StreamingVideoActivity" @@ -1667,7 +1803,10 @@ <activity android:name=".streamquality.PlayVideoActivity" android:label="@string/streaming_video" android:configChanges="keyboardHidden|orientation|screenSize" - android:screenOrientation="nosensor" /> + android:screenOrientation="nosensor" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <!-- FeatureSummaryActivity is replaced by CTS SystemFeaturesTest <activity android:name=".features.FeatureSummaryActivity" android:label="@string/feature_summary"> @@ -1686,6 +1825,8 @@ <action android:name="com.android.cts.verifier.location.SET_LOCATION_AND_CHECK" /> <category android:name="android.intent.category.DEFAULT"></category> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".net.ConnectivityBackgroundTestActivity" @@ -1696,6 +1837,8 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_networking" /> <meta-data android:name="test_required_features" android:value="android.hardware.wifi" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".net.MultiNetworkConnectivityTestActivity" @@ -1709,6 +1852,8 @@ android:value="android.hardware.wifi:android.hardware.telephony" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".nfc.NfcTestActivity" @@ -1720,165 +1865,275 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_hardware" /> <meta-data android:name="test_required_features" android:value="android.hardware.nfc" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name="com.android.cts.verifier.nfc.hce.HceReaderTestActivity" android:label="@string/nfc_hce_reader_tests" android:configChanges="keyboardHidden|orientation|screenSize"> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name="com.android.cts.verifier.nfc.hce.HceEmulatorTestActivity" android:label="@string/nfc_hce_emulator_tests" android:configChanges="keyboardHidden|orientation|screenSize"> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name="com.android.cts.verifier.nfc.hcef.HceFReaderTestActivity" android:label="@string/nfc_hce_f_reader_tests" android:configChanges="keyboardHidden|orientation|screenSize"> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name="com.android.cts.verifier.nfc.hcef.HceFEmulatorTestActivity" android:label="@string/nfc_hce_f_emulator_tests" android:configChanges="keyboardHidden|orientation|screenSize"> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name="com.android.cts.verifier.nfc.offhost.OffhostUiccReaderTestActivity" android:label="@string/nfc_offhost_uicc_reader_tests" android:configChanges="keyboardHidden|orientation|screenSize"> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name="com.android.cts.verifier.nfc.offhost.OffhostUiccEmulatorTestActivity" android:label="@string/nfc_offhost_uicc_emulator_tests" android:configChanges="keyboardHidden|orientation|screenSize"> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".nfc.NdefPushSenderActivity" android:label="@string/nfc_ndef_push_sender" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.NdefPushReceiverActivity" android:label="@string/nfc_ndef_push_receiver" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.LlcpVersionActivity" android:label="@string/nfc_llcp_version_check" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.TagVerifierActivity" android:label="@string/nfc_tag_verifier" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.DefaultRouteEmulatorActivity" android:label="@string/nfc_hce_default_route_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.ProtocolParamsEmulatorActivity" android:label="@string/nfc_hce_protocol_params_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.SinglePaymentEmulatorActivity" android:label="@string/nfc_hce_single_payment_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.SimpleReaderActivity" android:label="@string/nfc_hce_single_payment_reader" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.ProtocolParamsReaderActivity" android:label="@string/nfc_hce_protocol_params_reader" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.DualPaymentEmulatorActivity" android:label="@string/nfc_hce_dual_payment_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.ChangeDefaultEmulatorActivity" android:label="@string/nfc_hce_change_default_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.SingleNonPaymentEmulatorActivity" android:label="@string/nfc_hce_single_non_payment_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.DualNonPaymentEmulatorActivity" android:label="@string/nfc_hce_dual_non_payment_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.ConflictingNonPaymentEmulatorActivity" android:label="@string/nfc_hce_conflicting_non_payment_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.ForegroundNonPaymentEmulatorActivity" android:label="@string/nfc_hce_foreground_non_payment_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.ForegroundPaymentEmulatorActivity" android:label="@string/nfc_hce_foreground_payment_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.OffHostEmulatorActivity" android:label="@string/nfc_hce_offhost_service_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.OnAndOffHostEmulatorActivity" android:label="@string/nfc_hce_on_and_offhost_service_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.ThroughputEmulatorActivity" android:label="@string/nfc_hce_throughput_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.TapTestEmulatorActivity" android:label="@string/nfc_hce_tap_test_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.DynamicAidEmulatorActivity" android:label="@string/nfc_hce_payment_dynamic_aids_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.LargeNumAidsEmulatorActivity" android:label="@string/nfc_hce_large_num_aids_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.PrefixPaymentEmulatorActivity" android:label="@string/nfc_hce_payment_prefix_aids_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.PrefixPaymentEmulator2Activity" android:label="@string/nfc_hce_payment_prefix_aids_emulator_2" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.DualNonPaymentPrefixEmulatorActivity" android:label="@string/nfc_hce_other_prefix_aids_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hce.ConflictingNonPaymentPrefixEmulatorActivity" android:label="@string/nfc_hce_other_conflicting_prefix_aids_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hcef.HceFEmulatorActivity" android:label="@string/nfc_hce_f_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.hcef.HceFReaderActivity" android:label="@string/nfc_hce_f_reader" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.offhost.UiccTransactionEvent1EmulatorActivity" android:label="@string/nfc_offhost_uicc_transaction_event1_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.offhost.UiccTransactionEvent2EmulatorActivity" android:label="@string/nfc_offhost_uicc_transaction_event2_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.offhost.UiccTransactionEvent3EmulatorActivity" android:label="@string/nfc_offhost_uicc_transaction_event3_emulator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".nfc.offhost.SimpleOffhostReaderActivity" android:label="@string/nfc_offhost_uicc_transaction_event1_reader" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <!-- services used for testing NFC host-based card emulation --> <service android:name=".nfc.hce.PaymentService1" android:exported="true" @@ -2081,6 +2336,8 @@ android:value="android.hardware.sensor.accelerometer"/> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".sensors.GyroscopeMeasurementTestActivity" @@ -2095,6 +2352,8 @@ android:value="android.hardware.sensor.gyroscope"/> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".sensors.HeartRateMonitorTestActivity" @@ -2107,6 +2366,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_sensors" /> <meta-data android:name="test_required_features" android:value="android.hardware.sensor.heartrate" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".sensors.MagneticFieldMeasurementTestActivity" @@ -2119,6 +2380,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_sensors" /> <meta-data android:name="test_required_features" android:value="android.hardware.sensor.compass" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".sensors.OffBodySensorTestActivity" @@ -2148,12 +2411,16 @@ <meta-data android:name="test_required_features" android:value="android.hardware.sensor.accelerometer:android.hardware.sensor.gyroscope:android.hardware.sensor.compass:android.hardware.camera" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".sensors.RVCVRecordActivity" android:keepScreenOn="true" android:label="@string/snsr_rvcvxchk_test_rec" android:screenOrientation="locked" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> @@ -2222,6 +2489,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.camera.any"/> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".camera.intents.CameraIntentsActivity" @@ -2235,6 +2504,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.camera.any"/> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive:android.hardware.type.television:android.software.leanback"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <service android:name=".camera.intents.CameraContentJobService" @@ -2252,6 +2523,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.camera.any"/> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -2267,6 +2540,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.camera.any"/> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".camera.fov.DetermineFovActivity" @@ -2275,12 +2550,16 @@ android:theme="@android:style/Theme.Holo.NoActionBar.Fullscreen" > <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".camera.fov.CalibrationPreferenceActivity" android:label="@string/camera_fov_label_options" > <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> @@ -2296,6 +2575,8 @@ android:value="android.hardware.camera.any"/> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".camera.its.ItsTestActivity" @@ -2312,6 +2593,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.camera.any" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".camera.flashlight.CameraFlashlightActivity" @@ -2325,6 +2608,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.camera.flash" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".camera.performance.CameraPerformanceActivity" @@ -2338,6 +2623,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.camera.any" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".camera.bokeh.CameraBokehActivity" @@ -2352,6 +2639,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.camera.any" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".usb.accessory.UsbAccessoryTestActivity" @@ -2365,6 +2654,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.usb.accessory" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".usb.accessory.AccessoryAttachmentHandler"> @@ -2374,6 +2665,8 @@ <meta-data android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED" android:resource="@xml/accessory_filter" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".usb.device.UsbDeviceTestActivity" @@ -2388,6 +2681,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.usb.host" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".usb.mtp.MtpHostTestActivity" android:label="@string/mtp_host_test"> @@ -2399,6 +2694,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.usb.host" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive:android.hardware.type.television" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- Turned off Sensor Power Test in initial L release @@ -2423,10 +2720,14 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_networking" /> <meta-data android:name="test_required_features" android:value="android.hardware.wifi.direct" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.RecentsRedactionActivity" android:label="@string/provisioning_byod_recents" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.IntermediateRecentActivity" android:label="@string/provisioning_byod_recents" @@ -2435,6 +2736,8 @@ <action android:name="com.android.cts.verifier.managedprovisioning.RECENTS" /> <category android:name="android.intent.category.DEFAULT"></category> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".wifi.TestListActivity" android:label="@string/wifi_test" @@ -2445,6 +2748,8 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_networking" /> <meta-data android:name="test_required_features" android:value="android.hardware.wifi" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".wifiaware.TestListActivity" android:label="@string/aware_test" @@ -2455,6 +2760,8 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_networking" /> <meta-data android:name="test_required_features" android:value="android.hardware.wifi.aware" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".notifications.NotificationListenerVerifierActivity" @@ -2464,6 +2771,8 @@ <category android:name="android.cts.intent.category.MANUAL_TEST" /> </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_notifications" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <receiver android:name=".notifications.BlockChangeReceiver"> @@ -2497,6 +2806,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_notifications" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive:android.hardware.type.television:android.software.leanback:android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".notifications.AttentionManagementVerifierActivity" @@ -2508,6 +2819,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_notifications" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch:android.software.leanback" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".notifications.BubblesVerifierActivity" @@ -2519,6 +2832,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_notifications" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch:android.software.leanback:android.hardware.type.automotive:android.hardware.type.pc" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".notifications.BubbleActivity" @@ -2533,6 +2848,8 @@ <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".notifications.MediaPlayerVerifierActivity" @@ -2546,6 +2863,8 @@ <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch:android.software.leanback:android.hardware.type.automotive" /> <meta-data android:name="test_required_configs" android:value="config_quick_settings_supported" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <service android:name=".notifications.MockListener" @@ -2576,6 +2895,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_notifications" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch:android.software.leanback:android.hardware.type.automotive" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".qstiles.TileServiceVerifierActivity" @@ -2588,6 +2909,8 @@ <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch:android.hardware.type.automotive" /> <meta-data android:name="test_required_configs" android:value="config_quick_settings_supported" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <service android:name=".qstiles.MockTileService" @@ -2610,6 +2933,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_vr" /> <meta-data android:name="test_required_features" android:value="android.hardware.vr.high_performance" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".vr.MockVrActivity" @@ -2621,6 +2946,8 @@ <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".vr.MockVrActivity2" @@ -2632,6 +2959,8 @@ <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <service android:name=".vr.MockVrListenerService" @@ -2665,6 +2994,8 @@ <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch:android.hardware.type.television:android.software.leanback" /> <meta-data android:name="test_required_features" android:value="android.software.device_admin" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".security.CANotifyOnBootActivity" android:label="@string/caboot_test"> @@ -2676,6 +3007,8 @@ <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch:android.hardware.type.television:android.software.leanback" /> <meta-data android:name="test_required_features" android:value="android.software.device_admin" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".security.KeyChainTest" @@ -2688,6 +3021,8 @@ <!-- KeyChain is only installed on communication-oriented devices inheriting core.mk --> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch:android.hardware.type.television:android.software.leanback" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".security.CaCertInstallViaIntentTest" @@ -2700,187 +3035,324 @@ <!-- Skip certificate installation on devices that do not support KeyChain --> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch:android.hardware.type.television:android.software.leanback" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".wifi.NetworkRequestSpecificNetworkSpecifierTestActivity" android:label="@string/wifi_test_network_request_specific" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifi.NetworkRequestPatternNetworkSpecifierTestActivity" android:label="@string/wifi_test_network_request_pattern" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifi.NetworkRequestUnavailableNetworkSpecifierTestActivity" android:label="@string/wifi_test_network_request_unavailable" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifi.NetworkRequestInvalidCredentialNetworkSpecifierTestActivity" android:label="@string/wifi_test_network_request_invalid_credential" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifi.NetworkSuggestionSsidTestActivity" android:label="@string/wifi_test_network_suggestion_ssid" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifi.NetworkSuggestionSsidBssidTestActivity" android:label="@string/wifi_test_network_suggestion_ssid_bssid" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifi.NetworkSuggestionSsidPostConnectTestActivity" android:label="@string/wifi_test_network_suggestion_ssid_post_connect" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifi.NetworkSuggestionConnectionFailureTestActivity" android:label="@string/wifi_test_network_suggestion_connection_failure" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifi.NetworkSuggestionModificationInPlaceTestActivity" android:label="@string/wifi_test_network_suggestion_modification_in_place" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".p2p.GoNegRequesterTestListActivity" android:label="@string/p2p_go_neg_requester" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".p2p.GoNegRequesterTestActivity" android:label="@string/p2p_go_neg_requester" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".p2p.GoNegResponderTestActivity" android:label="@string/p2p_go_neg_responder" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".p2p.P2pClientTestListActivity" android:label="@string/p2p_join_go" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".p2p.P2pClientTestActivity" android:label="@string/p2p_join_go" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".p2p.GoTestActivity" android:label="@string/p2p_accept_client" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".p2p.P2pClientWithConfigTestListActivity" android:label="@string/p2p_join_go" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".p2p.P2pClientWithConfig2gBandTestListActivity" android:label="@string/p2p_join_go" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".p2p.P2pClientWithConfigFixedFrequencyTestListActivity" android:label="@string/p2p_join_go" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".p2p.P2pClientWithConfigTestActivity" android:label="@string/p2p_join_go" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".p2p.P2pClientWithConfig2gBandTestActivity" android:label="@string/p2p_join_go" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".p2p.P2pClientWithConfigFixedFrequencyTestActivity" android:label="@string/p2p_join_go" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".p2p.GoWithConfigTestActivity" android:label="@string/p2p_accept_client" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".p2p.GoWithConfig2gBandTestActivity" android:label="@string/p2p_accept_client" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".p2p.GoWithConfigFixedFrequencyTestActivity" android:label="@string/p2p_accept_client" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".p2p.ServiceRequesterTestListActivity" android:label="@string/p2p_service_discovery_requester" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".p2p.ServiceRequesterTestActivity" android:label="@string/p2p_service_discovery_requester" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".p2p.ServiceResponderTestActivity" android:label="@string/p2p_service_discovery_responder" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifiaware.DataPathOpenUnsolicitedPublishTestActivity" android:label="@string/aware_data_path_open_unsolicited_publish" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifiaware.DataPathOpenPassiveSubscribeTestActivity" android:label="@string/aware_data_path_open_passive_subscribe" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifiaware.DataPathPassphraseUnsolicitedPublishTestActivity" android:label="@string/aware_data_path_passphrase_unsolicited_publish" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifiaware.DataPathPassphrasePassiveSubscribeTestActivity" android:label="@string/aware_data_path_passphrase_passive_subscribe" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifiaware.DataPathPmkUnsolicitedPublishTestActivity" android:label="@string/aware_data_path_pmk_unsolicited_publish" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifiaware.DataPathPmkPassiveSubscribeTestActivity" android:label="@string/aware_data_path_pmk_passive_subscribe" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifiaware.DataPathOpenSolicitedPublishTestActivity" android:label="@string/aware_data_path_open_solicited_publish" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifiaware.DataPathOpenActiveSubscribeTestActivity" android:label="@string/aware_data_path_open_active_subscribe" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifiaware.DataPathPassphraseSolicitedPublishTestActivity" android:label="@string/aware_data_path_passphrase_solicited_publish" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifiaware.DataPathPassphraseActiveSubscribeTestActivity" android:label="@string/aware_data_path_passphrase_active_subscribe" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifiaware.DataPathPmkSolicitedPublishTestActivity" android:label="@string/aware_data_path_pmk_solicited_publish" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifiaware.DataPathPmkActiveSubscribeTestActivity" android:label="@string/aware_data_path_pmk_active_subscribe" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifiaware.DataPathOobOpenResponderTestActivity" android:label="@string/aware_data_path_oob_open_responder" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifiaware.DataPathOobOpenInitiatorTestActivity" android:label="@string/aware_data_path_oob_open_initiator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifiaware.DataPathOobPassphraseResponderTestActivity" android:label="@string/aware_data_path_oob_passphrase_responder" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifiaware.DataPathOobPassphraseInitiatorTestActivity" android:label="@string/aware_data_path_oob_passphrase_initiator" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifiaware.DiscoveryRangingPublishTestActivity" android:label="@string/aware_discovery_ranging_publish" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".wifiaware.DiscoveryRangingSubscribeTestActivity" android:label="@string/aware_discovery_ranging_subscribe" - android:configChanges="keyboardHidden|orientation|screenSize" /> + android:configChanges="keyboardHidden|orientation|screenSize" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity-alias android:name=".CtsVerifierActivity" android:label="@string/app_name" android:targetActivity=".TestListActivity"> @@ -2912,6 +3384,8 @@ android:value="android.software.app_widgets" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive:android.hardware.ram.low" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".deskclock.DeskClockTestsActivity" @@ -2923,6 +3397,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_deskclock" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.automotive" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- TODO: enable when not requiring to tap the screen and timeouts are tuned --> @@ -3073,6 +3549,8 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_projection" /> <meta-data android:name="test_required_features" android:value="android.hardware.faketouch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".projection.widgets.ProjectionWidgetActivity" @@ -3083,6 +3561,8 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_projection" /> <meta-data android:name="test_required_features" android:value="android.hardware.faketouch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".projection.list.ProjectionListActivity" @@ -3094,6 +3574,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_projection" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".projection.video.ProjectionVideoActivity" @@ -3105,6 +3587,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_projection" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".projection.touch.ProjectionTouchActivity" @@ -3116,6 +3600,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_projection" /> <meta-data android:name="test_required_features" android:value="android.hardware.faketouch:android.hardware.touchscreen.multitouch" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> @@ -3128,6 +3614,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_projection" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.automotive" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <service android:name=".projection.ProjectionService" @@ -3144,9 +3632,14 @@ <meta-data android:name="test_excluded_features" android:value="android.software.lockscreen_disabled" /> <meta-data android:name="test_required_features" android:value="android.software.device_admin" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> - <activity android:name=".managedprovisioning.DeviceOwnerNegativeTestActivity$TrampolineActivity" /> + <activity android:name=".managedprovisioning.DeviceOwnerNegativeTestActivity$TrampolineActivity" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".managedprovisioning.EnterprisePrivacyInfoOnlyTestActivity" android:label="@string/enterprise_privacy_test"> @@ -3154,6 +3647,8 @@ <action android:name="com.android.cts.verifier.managedprovisioning.action.CHECK_ENTERPRISE_PRIVACY_INFO_ONLY" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.DeviceOwnerPositiveTestActivity" @@ -3168,6 +3663,8 @@ <meta-data android:name="test_excluded_features" android:value="android.software.lockscreen_disabled" /> <meta-data android:name="test_required_features" android:value="android.software.device_admin" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.ManagedUserPositiveTestActivity" @@ -3177,6 +3674,8 @@ <action android:name="com.android.cts.verifier.managedprovisioning.action.CHECK_AFFILIATED_PROFILE_OWNER" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.DeviceOwnerRequestingBugreportTestActivity" @@ -3189,14 +3688,20 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_managed_provisioning" /> <meta-data android:name="test_required_features" android:value="android.software.device_admin" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.NonMarketAppsActivity" android:label="@string/provisioning_byod_non_market_apps"> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.KeyguardDisabledFeaturesActivity" android:label="@string/provisioning_byod_keyguard_disabled_features"> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.CrossProfilePermissionControlActivity" @@ -3205,10 +3710,14 @@ <action android:name="com.android.cts.verifier.managedprovisioning.action.CROSS_PROFILE_PERMISSION_CONTROL" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.DisallowAppsControlActivity" android:label="@string/provisioning_byod_disallow_apps_control"> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.LockTaskUiTestActivity" @@ -3217,10 +3726,14 @@ <action android:name="com.android.cts.verifier.managedprovisioning.action.STOP_LOCK_TASK" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.WifiLockdownTestActivity" android:label="@string/device_owner_wifi_lockdown_test"> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.VpnTestActivity" @@ -3229,6 +3742,8 @@ <action android:name="com.android.cts.verifier.managedprovisioning.VPN" /> <category android:name="android.intent.category.DEFAULT"></category> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <service android:name=".managedprovisioning.VpnTestActivity$MyTestVpnService" @@ -3244,6 +3759,8 @@ <action android:name="com.android.cts.verifier.managedprovisioning.action.ALWAYS_ON_VPN_SETTINGS_TEST" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.KeyChainTestActivity" @@ -3252,6 +3769,8 @@ <action android:name="com.android.cts.verifier.managedprovisioning.KEYCHAIN" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.PermissionLockdownTestActivity" @@ -3260,6 +3779,8 @@ <action android:name="com.android.cts.verifier.managedprovisioning.action.CHECK_PERMISSION_LOCKDOWN" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity-alias @@ -3273,6 +3794,8 @@ <activity android:name=".managedprovisioning.OrganizationInfoTestActivity" android:label="@string/provisioning_byod_organization_info"> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.PolicyTransparencyTestListActivity" @@ -3281,6 +3804,8 @@ <action android:name="com.android.cts.verifier.managedprovisioning.action.CHECK_POLICY_TRANSPARENCY" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.PolicyTransparencyTestActivity"> @@ -3288,6 +3813,8 @@ <action android:name="com.android.cts.verifier.managedprovisioning.action.SHOW_POLICY_TRANSPARENCY_TEST" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.EnterprisePrivacyTestListActivity" @@ -3296,6 +3823,8 @@ <action android:name="com.android.cts.verifier.managedprovisioning.action.CHECK_ENTERPRISE_PRIVACY" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.EnterprisePrivacyTestDefaultAppActivity" @@ -3338,6 +3867,8 @@ <action android:name="android.intent.action.CALL" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.CommandReceiverActivity" @@ -3347,6 +3878,8 @@ <action android:name="com.android.cts.verifier.managedprovisioning.action.EXECUTE_COMMAND" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.SetSupportMessageActivity"> @@ -3354,6 +3887,8 @@ <action android:name="com.android.cts.verifier.managedprovisioning.action.SET_SUPPORT_MSG" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <service android:name=".managedprovisioning.PolicyTransparencyTestActivity$DummyInputMethod" @@ -3379,6 +3914,8 @@ <action android:name="com.android.cts.verifier.managedprovisioning.action.AUTH_BOUND_KEY_TEST" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.ByodFlowTestActivity" @@ -3402,6 +3939,8 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_managed_provisioning" /> <meta-data android:name="test_required_features" android:value="android.software.managed_users:android.software.device_admin" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <receiver @@ -3419,9 +3958,14 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_managed_provisioning" /> <meta-data android:name="test_required_features" android:value="android.software.managed_users:android.software.device_admin" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> - <activity android:name=".managedprovisioning.ByodProvisioningTestActivity$ProvisioningStartingActivity" /> + <activity android:name=".managedprovisioning.ByodProvisioningTestActivity$ProvisioningStartingActivity" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".managedprovisioning.ByodHelperActivity"> <intent-filter> @@ -3454,6 +3998,8 @@ <action android:name="com.android.cts.verifier.managedprovisioning.TEST_PARENT_PROFILE_PASSWORD" /> <category android:name="android.intent.category.DEFAULT"></category> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.ByodPrimaryHelperActivity"> @@ -3461,10 +4007,14 @@ <action android:name="com.android.cts.verifier.managedprovisioning.BYOD_INSTALL_APK_IN_PRIMARY" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.NfcTestActivity"> <meta-data android:name="test_required_features" android:value="android.hardware.nfc" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <provider @@ -3482,6 +4032,8 @@ <action android:name="com.android.cts.verifier.managedprovisioning.BYOD_SAMPLE_ICON" /> <category android:name="android.intent.category.DEFAULT"></category> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.HandleIntentActivity" @@ -3554,6 +4106,8 @@ <data android:scheme="geo" /> <data android:scheme="market" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.CrossProfileTestActivity"> @@ -3574,6 +4128,8 @@ <data android:mimeType="*/*" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.WorkStatusTestActivity"> @@ -3582,10 +4138,14 @@ <action android:name="com.android.cts.verifier.managedprovisioning.WORK_STATUS_TOAST" /> <category android:name="android.intent.category.DEFAULT"></category> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.TurnOffWorkActivity" android:label="@string/provisioning_byod_turn_off_work"> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.WorkProfileWidgetActivity" @@ -3594,6 +4154,8 @@ <action android:name="com.android.cts.verifier.byod.test_work_profile_widget"/> <category android:name="android.intent.category.DEFAULT"/> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <receiver android:name=".managedprovisioning.DeviceAdminTestReceiver" @@ -3612,7 +4174,10 @@ </service> <!-- Used by the SensorTestScreenManipulator to reset the screen timeout after turn off. --> - <activity android:name=".os.TimeoutResetActivity"/> + <activity android:name=".os.TimeoutResetActivity"> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <activity android:name=".tv.TvInputDiscoveryTestActivity" android:label="@string/tv_input_discover_test"> @@ -3623,6 +4188,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_tv" /> <meta-data android:name="test_required_features" android:value="android.software.live_tv" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".tv.ParentalControlTestActivity" @@ -3634,6 +4201,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_tv" /> <meta-data android:name="test_required_features" android:value="android.software.live_tv" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".tv.MultipleTracksTestActivity" @@ -3645,6 +4214,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_tv" /> <meta-data android:name="test_required_features" android:value="android.software.live_tv" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".tv.TimeShiftTestActivity" @@ -3656,6 +4227,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_tv" /> <meta-data android:name="test_required_features" android:value="android.software.live_tv" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".tv.AppLinkTestActivity" @@ -3668,6 +4241,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_tv" /> <meta-data android:name="test_required_features" android:value="android.software.live_tv" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".tv.MicrophoneDeviceTestActivity" @@ -3679,6 +4254,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_tv" /> <meta-data android:name="test_required_features" android:value="android.software.leanback" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".tv.audio.AudioCapabilitiesTestActivity" @@ -3704,9 +4281,10 @@ android:value="android.software.leanback" /> <meta-data android:name="test_required_configs" android:value="config_tv_panel"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> - <activity android:name=".screenpinning.ScreenPinningTestActivity" android:label="@string/screen_pinning_test"> <intent-filter> @@ -3716,12 +4294,16 @@ <meta-data android:name="test_category" android:value="@string/test_category_other" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch:android.hardware.type.automotive" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".tv.MockTvInputSetupActivity"> <intent-filter> <action android:name="android.intent.action.MAIN" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.RingerModeActivity" @@ -3733,6 +4315,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_audio" /> <meta-data android:name="test_excluded_features" android:value="android.software.leanback" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.HifiUltrasoundTestActivity" @@ -3744,6 +4328,8 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_audio" /> <meta-data android:name="test_required_features" android:value="android.hardware.microphone" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.HifiUltrasoundSpeakerTestActivity" @@ -3755,6 +4341,8 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_audio" /> <meta-data android:name="test_required_features" android:value="android.hardware.audio.output" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.AudioOutputDeviceNotificationsActivity" @@ -3766,6 +4354,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_audio" /> <meta-data android:name="test_required_features" android:value="android.hardware.audio.output" /> <meta-data android:name="test_excluded_features" android:value="android.software.leanback" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.AudioInputDeviceNotificationsActivity" @@ -3777,6 +4367,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_audio" /> <meta-data android:name="test_required_features" android:value="android.hardware.microphone" /> <meta-data android:name="test_excluded_features" android:value="android.software.leanback" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.AudioOutputRoutingNotificationsActivity" @@ -3788,6 +4380,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_audio" /> <meta-data android:name="test_required_features" android:value="android.hardware.audio.output" /> <meta-data android:name="test_excluded_features" android:value="android.software.leanback" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.AudioInputRoutingNotificationsActivity" @@ -3799,6 +4393,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_audio" /> <meta-data android:name="test_required_features" android:value="android.hardware.microphone" /> <meta-data android:name="test_excluded_features" android:value="android.software.leanback" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.USBAudioPeripheralAttributesActivity" @@ -3811,6 +4407,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.usb.host" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch:android.hardware.type.automotive" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.USBAudioPeripheralNotificationsTest" @@ -3823,6 +4421,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.usb.host" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch:android.hardware.type.automotive" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.USBAudioPeripheralPlayActivity" @@ -3835,6 +4435,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.usb.host" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch:android.hardware.type.automotive" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.USBAudioPeripheralRecordActivity" @@ -3847,6 +4449,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.usb.host" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch:android.hardware.type.automotive" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.USBAudioPeripheralButtonsActivity" @@ -3859,6 +4463,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.usb.host" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch:android.hardware.type.automotive" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.USBRestrictRecordAActivity" @@ -3871,6 +4477,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.usb.host" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch:android.hardware.type.automotive" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.ProAudioActivity" @@ -3881,6 +4489,8 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_audio" /> <meta-data android:name="test_required_features" android:value="android.hardware.usb.host:android.hardware.audio.pro" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- ProAudio test invokes the "Loopback" App --> @@ -3896,6 +4506,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.microphone:android.hardware.audio.output" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.watch:android.hardware.type.television" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.MidiActivity" @@ -3907,6 +4519,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_audio" /> <meta-data android:name="test_required_features" android:value="android.hardware.usb.host:android.software.midi" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.NDKMidiActivity" @@ -3918,6 +4532,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_audio" /> <meta-data android:name="test_required_features" android:value="android.hardware.usb.host:android.software.midi" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <service android:name="com.android.midi.MidiEchoTestService" @@ -3937,6 +4553,8 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_audio" /> <meta-data android:name="test_required_features" android:value="android.hardware.microphone:android.hardware.audio.output" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.AudioFrequencySpeakerActivity" @@ -3947,6 +4565,8 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_audio" /> <meta-data android:name="test_required_features" android:value="android.hardware.audio.output:android.hardware.usb.host" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.AudioFrequencyMicActivity" @@ -3957,6 +4577,8 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_audio" /> <meta-data android:name="test_required_features" android:value="android.hardware.microphone:android.hardware.audio.output:android.hardware.usb.host" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.AudioFrequencyUnprocessedActivity" @@ -3967,6 +4589,8 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_audio" /> <meta-data android:name="test_required_features" android:value="android.hardware.microphone:android.hardware.usb.host" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.AudioFrequencyVoiceRecognitionActivity" @@ -3977,6 +4601,8 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_audio" /> <meta-data android:name="test_required_features" android:value="android.hardware.microphone:android.hardware.usb.host" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".audio.AudioAEC" @@ -3987,6 +4613,8 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_audio" /> <meta-data android:name="test_required_features" android:value="android.hardware.microphone:android.hardware.audio.output" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <service android:name=".tv.MockTvInputService" @@ -4015,7 +4643,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_car" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch:android.hardware.type.automotive" /> - + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".car.CarDockActivity" @@ -4026,6 +4655,8 @@ <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- See explaination in CarDockTestActivity.java --> @@ -4078,6 +4709,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.type.automotive"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".car.NightModeTestActivity" @@ -4090,6 +4723,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.type.automotive"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".car.ParkingBrakeOnTestActivity" @@ -4102,6 +4737,8 @@ <meta-data android:name="test_required_features" android:value="android.hardware.type.automotive"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <!-- 6DoF sensor test --> @@ -4113,10 +4750,14 @@ <category android:name="android.cts.intent.category.MANUAL_TEST"/> </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_sensors"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name="com.android.cts.verifier.sensors.sixdof.Activities.TestActivity" android:label="@string/title_activity_cts"> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".voicemail.VoicemailBroadcastActivity" @@ -4141,6 +4782,8 @@ <meta-data android:name="test_required_configs" android:value="config_voice_capable"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <receiver android:name=".voicemail.VoicemailBroadcastReceiver"> @@ -4166,6 +4809,8 @@ <meta-data android:name="test_required_configs" android:value="config_voice_capable"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -4185,6 +4830,8 @@ <meta-data android:name="test_required_configs" android:value="config_voice_capable"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <service android:name=".dialer.DialerCallTestService" @@ -4212,6 +4859,8 @@ <meta-data android:name="test_required_configs" android:value="config_voice_capable"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -4231,6 +4880,8 @@ <meta-data android:name="test_required_configs" android:value="config_voice_capable"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -4250,6 +4901,8 @@ <meta-data android:name="test_required_configs" android:value="config_voice_capable"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -4269,6 +4922,8 @@ <meta-data android:name="test_required_configs" android:value="config_voice_capable"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <service @@ -4297,6 +4952,8 @@ <meta-data android:name="test_required_configs" android:value="config_voice_capable"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -4316,6 +4973,8 @@ <meta-data android:name="test_required_configs" android:value="config_voice_capable"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -4335,6 +4994,8 @@ <meta-data android:name="test_required_configs" android:value="config_voice_capable"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity @@ -4354,10 +5015,15 @@ <meta-data android:name="test_required_configs" android:value="config_voice_capable"/> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".managedprovisioning.LockscreenMessageTestActivity" - android:label="@string/device_owner_customize_lockscreen_message" /> + android:label="@string/device_owner_customize_lockscreen_message" > + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> + </activity> <service android:name="com.android.cts.verifier.telecom.CtsConnectionService" android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE" > @@ -4380,6 +5046,8 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_instant_apps" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.automotive" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".instantapps.RecentAppsTestActivity" android:label="@string/ia_recents"> @@ -4389,6 +5057,8 @@ </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_instant_apps" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.automotive" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".instantapps.AppInfoTestActivity" android:label="@string/ia_app_info"> @@ -4399,6 +5069,8 @@ <meta-data android:name="test_category" android:value="@string/test_category_instant_apps" /> <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.automotive" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> <activity android:name=".displaycutout.DisplayCutoutTestActivity" @@ -4408,6 +5080,8 @@ <category android:name="android.cts.intent.category.MANUAL_TEST" /> </intent-filter> <meta-data android:name="test_category" android:value="@string/test_category_display_cutout" /> + <meta-data android:name="display_mode" + android:value="multi_display_mode" /> </activity> </application> diff --git a/tests/tests/net/jni/NativeMultinetworkJni.cpp b/tests/tests/net/jni/NativeMultinetworkJni.cpp index cd94709fd5f..60e31bc78a3 100644 --- a/tests/tests/net/jni/NativeMultinetworkJni.cpp +++ b/tests/tests/net/jni/NativeMultinetworkJni.cpp @@ -458,20 +458,16 @@ JNIEXPORT jint Java_android_net_cts_MultinetworkApiTest_runDatagramCheck( setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &timeo, sizeof(timeo)); // For reference see: - // https://tools.ietf.org/html/draft-tsvwg-quic-protocol#section-6.1 + // https://datatracker.ietf.org/doc/html/draft-ietf-quic-invariants uint8_t quic_packet[1200] = { - 0x0d, // public flags: - // - version present (0x01), - // - 64bit connection ID (0x0c), - // - 1 byte packet number (0x00) + 0xc0, // long header + 0xaa, 0xda, 0xca, 0xca, // reserved-space version number + 0x08, // destination connection ID length 0, 0, 0, 0, 0, 0, 0, 0, // 64bit connection ID - 0xaa, 0xda, 0xca, 0xaa, // reserved-space version number - 1, // 1 byte packet number - 0x00, // private flags - 0x07, // PING frame (cuz why not) + 0x00, // source connection ID length }; - arc4random_buf(quic_packet + 1, 8); // random connection ID + arc4random_buf(quic_packet + 6, 8); // random connection ID uint8_t response[1500]; ssize_t sent, rcvd; @@ -496,7 +492,7 @@ JNIEXPORT jint Java_android_net_cts_MultinetworkApiTest_runDatagramCheck( i + 1, MAX_RETRIES, rcvd, errnum); } } - if (rcvd < 9) { + if (rcvd < 15) { LOGD("QUIC UDP %s: sent=%zd but rcvd=%zd, errno=%d", kPort, sent, rcvd, errnum); if (rcvd <= 0) { LOGD("Does this network block UDP port %s?", kPort); @@ -505,7 +501,7 @@ JNIEXPORT jint Java_android_net_cts_MultinetworkApiTest_runDatagramCheck( return -EPROTO; } - int conn_id_cmp = memcmp(quic_packet + 1, response + 1, 8); + int conn_id_cmp = memcmp(quic_packet + 6, response + 7, 8); if (conn_id_cmp != 0) { LOGD("sent and received connection IDs do not match"); close(fd); diff --git a/tests/tests/provider/src/android/provider/cts/SettingsPanelTest.java b/tests/tests/provider/src/android/provider/cts/SettingsPanelTest.java index c3c2cad234c..e58ca44b01c 100644 --- a/tests/tests/provider/src/android/provider/cts/SettingsPanelTest.java +++ b/tests/tests/provider/src/android/provider/cts/SettingsPanelTest.java @@ -318,9 +318,6 @@ public class SettingsPanelTest { assumeTrue(mHasTouchScreen); pressSeeMore(); - // Assert that we're still in Settings, on a different page. - currentPackage = mDevice.getCurrentPackageName(); - assertThat(currentPackage).isEqualTo(mSettingsPackage); UiObject2 titleView = mDevice.findObject(By.res(mSettingsPackage, RESOURCE_TITLE)); assertThat(titleView).isNull(); } |