commit 15405555cb90e0f28b737e9a29a7c3bb428e566e
author Android Merger <android-build-merger@google.com> Wed May 31 17:23:32 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 31 17:23:34 2017 +0000
tree 25b9fdec6b08d295186b1179ddf2da2cb2fdfd22
parent 616abaa818a2f6ff8b73b5b0d5eded0af7675912
parent 3d8bf1e84406368aca2c04f97075046171561fda

Merge "Merge "Merge "Skip camera test on devices without a camera" into nougat-cts-dev am: 1a69216da0" into nougat-mr1-cts-dev am: 44d72186a0"

apps/CtsVerifier/src/com/android/cts/verifier/admin/DeviceAdminKeyguardDisabledFeaturesActivity.java

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 b53392a..c8bffdf 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/admin/DeviceAdminKeyguardDisabledFeaturesActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/admin/DeviceAdminKeyguardDisabledFeaturesActivity.java
@@ -60,10 +60,13 @@
         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,
-                new Intent(ByodHelperActivity.ACTION_LOCKNOW)));
+
+        if (getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA)) {
+            adapter.add(new DialogTestListItem(this, R.string.device_admin_keyguard_disable_camera,
+                    getTestIdPrefix()+"KeyguardDisableCamera",
+                    R.string.device_admin_keyguard_disable_camera_instruction,
+                    new Intent(ByodHelperActivity.ACTION_LOCKNOW)));
+        }
 
         adapter.add(new DialogTestListItem(this, R.string.device_admin_disable_notifications,
                 "DeviceAdmin_DisableNotifications",