commit fa7741be9430d82ab3809ac3ed4cdb9a7011d153
author Rubin Xu <rubinxu@google.com> Mon Nov 09 16:24:52 2020 +0000
committer Rubin Xu <rubinxu@google.com> Mon Nov 09 16:31:14 2020 +0000
tree dff9eb2d95322a603c17d55fd9e64aa4c47484eb
parent a13b79c766aa3a91c0486dc2c31deeada06e9179

Mark tests for single display modes

These test are not dependent on foldable modes so exclude
them from folded mode.

Bug: 169166957
Test: compiles
Change-Id: I1b797d07b47273318a5f3edc511b3ee05c2a6e3b

apps/CtsVerifier/AndroidManifest.xml

diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 1fd2b2d..f263247 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -1788,7 +1788,7 @@
             <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" />
+                       android:value="single_display_mode" />
         </activity>
 
         <activity android:name=".security.ProtectedConfirmationTest"
@@ -1818,7 +1818,7 @@
             <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" />
+                       android:value="single_display_mode" />
         </activity>
 
         <activity android:name=".security.LockConfirmBypassTest"
@@ -1835,7 +1835,7 @@
             <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" />
+                       android:value="single_display_mode" />
         </activity>
 
         <activity android:name=".security.SetNewPasswordComplexityTest"
@@ -1852,7 +1852,7 @@
             <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" />
+                       android:value="single_display_mode" />
         </activity>
 
         <activity android:name=".streamquality.StreamingVideoActivity"
@@ -3122,7 +3122,7 @@
                     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" />
+                       android:value="single_display_mode" />
         </activity>
         <activity android:name=".security.CANotifyOnBootActivity"
                 android:exported="true"
@@ -3136,7 +3136,7 @@
                     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" />
+                       android:value="single_display_mode" />
         </activity>
 
         <activity android:name=".security.KeyChainTest"
@@ -3151,7 +3151,7 @@
             <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" />
+                       android:value="single_display_mode" />
         </activity>
 
         <activity android:name=".security.CaCertInstallViaIntentTest"
@@ -3166,7 +3166,7 @@
             <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" />
+                       android:value="single_display_mode" />
         </activity>
 
         <activity android:name=".wifi.NetworkRequestSpecificNetworkSpecifierTestActivity"