Merge "Skip Keyguard CTS test on ATV devices." into pie-cts-dev

1 files changed, 22 insertions, 0 deletions

diff --git a/tests/tests/keystore/src/android/keystore/cts/CipherTest.java b/tests/tests/keystore/src/android/keystore/cts/CipherTest.java
index 66404b2ab26..e75a60ff26a 100644
--- a/tests/tests/keystore/src/android/keystore/cts/CipherTest.java
+++ b/tests/tests/keystore/src/android/keystore/cts/CipherTest.java
@@ -18,6 +18,7 @@ package android.keystore.cts;
 
 import android.app.KeyguardManager;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.os.SystemClock;
 import android.platform.test.annotations.Presubmit;
 import android.security.keystore.KeyGenParameterSpec;
@@ -439,9 +440,18 @@ public class CipherTest extends AndroidTestCase {
         }
     }
 
+    private boolean isLeanbackOnly() {
+        PackageManager pm = getContext().getPackageManager();
+        return (pm != null && pm.hasSystemFeature("android.software.leanback_only"));
+    }
+
     @Presubmit
     public void testKeyguardLockAndUnlock()
             throws Exception {
+        if (isLeanbackOnly()) {
+            return;
+        }
+
         try (DeviceLockSession dl = new DeviceLockSession()) {
             KeyguardManager keyguardManager = (KeyguardManager)getContext()
                     .getSystemService(Context.KEYGUARD_SERVICE);
@@ -459,6 +469,10 @@ public class CipherTest extends AndroidTestCase {
         final boolean isUnlockedDeviceRequired = true;
         final boolean isUserAuthRequired = false;
 
+        if (isLeanbackOnly()) {
+            return;
+        }
+
         try (DeviceLockSession dl = new DeviceLockSession()) {
             KeyguardManager keyguardManager = (KeyguardManager)getContext()
                 .getSystemService(Context.KEYGUARD_SERVICE);
@@ -947,6 +961,10 @@ public class CipherTest extends AndroidTestCase {
         final boolean isUnlockedDeviceRequired = false;
         final boolean isUserAuthRequired = true;
 
+        if (isLeanbackOnly()) {
+            return;
+        }
+
         try (DeviceLockSession dl = new DeviceLockSession()) {
             KeyguardManager keyguardManager = (KeyguardManager)getContext().getSystemService(Context.KEYGUARD_SERVICE);
 
@@ -970,6 +988,10 @@ public class CipherTest extends AndroidTestCase {
         final boolean isUserAuthRequired = true;
         final boolean isUnlockedDeviceRequired = false;
 
+        if (isLeanbackOnly()) {
+            return;
+        }
+
         KeyguardManager keyguardManager = (KeyguardManager)getContext().getSystemService(Context.KEYGUARD_SERVICE);
         assertFalse(keyguardManager.isDeviceLocked());