commit cc0f01b5b4991a1b7b4fedb6220594d58479dd28
author Eino-Ville Talvala <etalvala@google.com> Wed Dec 03 18:53:55 2014 +0000
committer Eino-Ville Talvala <etalvala@google.com> Wed Dec 03 11:19:28 2014 -0800
tree 5137c87b4ed7b9a275f97d5eed732b0e5c781ac9
parent a3f9e038346276e9e657d1e5dc62689431bc09a6

Revert "Camera2: Cross-check BURST_CAPTURE/READ_SENSOR_SETTINGS feature/capability"

This reverts commit c3549f963ccb356f22446365b8c08097ba3152ac.

Bug: 18281970
Bug: 18573576
Change-Id: Ib1547b531e4afd9b100d340cd17b0b78ae203ae1

tests/tests/app/src/android/app/cts/SystemFeaturesTest.java

diff --git a/tests/tests/app/src/android/app/cts/SystemFeaturesTest.java b/tests/tests/app/src/android/app/cts/SystemFeaturesTest.java
index 495501f..620c51f 100644
--- a/tests/tests/app/src/android/app/cts/SystemFeaturesTest.java
+++ b/tests/tests/app/src/android/app/cts/SystemFeaturesTest.java
@@ -141,8 +141,6 @@
         boolean manualSensor = false;
         boolean manualPostProcessing = false;
         boolean raw = false;
-        boolean readSensorSettings = false;
-        boolean burstCapture = false;
         CameraCharacteristics[] cameraChars = new CameraCharacteristics[cameraIds.length];
         for (String cameraId : cameraIds) {
             CameraCharacteristics chars = mCameraManager.getCameraCharacteristics(cameraId);
@@ -162,14 +160,8 @@
                     case CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_RAW:
                         raw = true;
                         break;
-                    case CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS:
-                        readSensorSettings = true;
-                        break;
-                    case CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE:
-                        burstCapture = true;
-                        break;
                     default:
-                        // Capabilities that don't have a matching system feature
+                        // Capabilities don't have a matching system feature
                         break;
                 }
             }
@@ -179,8 +171,6 @@
         assertFeature(manualPostProcessing,
                 PackageManager.FEATURE_CAMERA_CAPABILITY_MANUAL_POST_PROCESSING);
         assertFeature(raw, PackageManager.FEATURE_CAMERA_CAPABILITY_RAW);
-        assertFeature(readSensorSettings, PackageManager.FEATURE_CAMERA_CAPABILITY_READ_SENSOR_SETTINGS);
-        assertFeature(burstCapture, PackageManager.FEATURE_CAMERA_CAPABILITY_BURST_CAPTURE);
     }
 
     private void checkFrontCamera() {