Remove trust agents test if platform has none.
Don't test whether turst agents can be enabled
on device without trust agents.
Change-Id: I865b2812b5659b021c1ac86ed86cdbc042b37cc5
Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/admin/DeviceAdminKeyguardDisabledFeaturesActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/admin/DeviceAdminKeyguardDisabledFeaturesActivity.java
index 2ad77f6..b53392a 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/admin/DeviceAdminKeyguardDisabledFeaturesActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/admin/DeviceAdminKeyguardDisabledFeaturesActivity.java
@@ -20,6 +20,8 @@
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
import android.hardware.fingerprint.FingerprintManager;
import android.provider.Settings;
@@ -30,6 +32,7 @@
import com.android.cts.verifier.managedprovisioning.DeviceAdminTestReceiver;
import com.android.cts.verifier.managedprovisioning.KeyguardDisabledFeaturesActivity;
+import java.util.List;
/**
* Tests for Device Admin keyguard disabled features.
@@ -54,7 +57,9 @@
@Override
protected void setupTests(ArrayTestListAdapter adapter) {
setupFingerprintTests(adapter);
- setupDisableTrustAgentsTest(adapter);
+ if (hasTrustAgents()) {
+ setupDisableTrustAgentsTest(adapter);
+ }
adapter.add(new DialogTestListItem(this, R.string.device_admin_keyguard_disable_camera,
getTestIdPrefix()+"KeyguardDisableCamera",
R.string.device_admin_keyguard_disable_camera_instruction,
@@ -65,4 +70,11 @@
R.string.device_admin_disable_notifications_instruction,
new Intent(ByodHelperActivity.ACTION_NOTIFICATION_ON_LOCKSCREEN)));
}
+
+ private boolean hasTrustAgents() {
+ PackageManager packageManager = getPackageManager();
+ Intent intent = new Intent("android.service.trust.TrustAgentService");
+ List<ResolveInfo> resolveInfos = packageManager.queryIntentServices(intent, 0);
+ return resolveInfos.size() > 0;
+ }
}
