1 files changed, 12 insertions, 0 deletions
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleSecureClientTestListActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleSecureClientTestListActivity.java
index 54f8ad1d304..90848a9e07f 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleSecureClientTestListActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleSecureClientTestListActivity.java
@@ -17,7 +17,9 @@
 package com.android.cts.verifier.bluetooth;
 
 import android.bluetooth.BluetoothAdapter;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.os.SystemProperties;
 
 import com.android.cts.verifier.ManifestTestListAdapter;
 import com.android.cts.verifier.PassFailButtons;
@@ -42,6 +44,16 @@ public class BleSecureClientTestListActivity extends PassFailButtons.TestListAct
                     "com.android.cts.verifier.bluetooth.BleAdvertiserHardwareScanFilterActivity.");
         }
 
+        // RPA is optional on TVs already released before Android 11
+        boolean isTv = getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK);
+        int firstSdk = SystemProperties.getInt("ro.product.first_api_level", 0);
+        if (isTv && (firstSdk <= 29)) {
+            disabledTest.add(
+                    "com.android.cts.verifier.bluetooth.BleSecureConnectionPriorityClientTestActivity");
+            disabledTest.add(
+                    "com.android.cts.verifier.bluetooth.BleSecureEncryptedClientTestActivity");
+        }
+
         setTestListAdapter(new ManifestTestListAdapter(this, getClass().getName(),
                 disabledTest.toArray(new String[disabledTest.size()])));
     }