DO NOT MERGE: Revert "Camera: cross check camera2 features"
This change should only be present in L-MR1 and forward.
This reverts commit 24ddab5fe18b5577c6c5e54b575bdc0e93591ea8.
Bug: 25651300
diff --git a/tests/tests/app/src/android/app/cts/SystemFeaturesTest.java b/tests/tests/app/src/android/app/cts/SystemFeaturesTest.java
index 4e57d31..b840f8f 100644
--- a/tests/tests/app/src/android/app/cts/SystemFeaturesTest.java
+++ b/tests/tests/app/src/android/app/cts/SystemFeaturesTest.java
@@ -32,9 +32,6 @@
import android.hardware.SensorManager;
import android.hardware.Camera.CameraInfo;
import android.hardware.Camera.Parameters;
-import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CameraManager;
-import android.hardware.camera2.CameraMetadata;
import android.location.LocationManager;
import android.net.sip.SipManager;
import android.net.wifi.WifiManager;
@@ -62,7 +59,6 @@
private SensorManager mSensorManager;
private TelephonyManager mTelephonyManager;
private WifiManager mWifiManager;
- private CameraManager mCameraManager;
@Override
protected void setUp() throws Exception {
@@ -81,7 +77,6 @@
mSensorManager = (SensorManager) mContext.getSystemService(Context.SENSOR_SERVICE);
mTelephonyManager = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
- mCameraManager = (CameraManager) mContext.getSystemService(Context.CAMERA_SERVICE);
}
/**
@@ -111,7 +106,7 @@
}
}
- public void testCameraFeatures() throws Exception {
+ public void testCameraFeatures() {
int numCameras = Camera.getNumberOfCameras();
if (numCameras == 0) {
assertNotAvailable(PackageManager.FEATURE_CAMERA);
@@ -119,11 +114,6 @@
assertNotAvailable(PackageManager.FEATURE_CAMERA_FLASH);
assertNotAvailable(PackageManager.FEATURE_CAMERA_FRONT);
assertNotAvailable(PackageManager.FEATURE_CAMERA_ANY);
- assertNotAvailable(PackageManager.FEATURE_CAMERA_LEVEL_FULL);
- assertNotAvailable(PackageManager.FEATURE_CAMERA_CAPABILITY_MANUAL_SENSOR);
- assertNotAvailable(PackageManager.FEATURE_CAMERA_CAPABILITY_MANUAL_POST_PROCESSING);
- assertNotAvailable(PackageManager.FEATURE_CAMERA_CAPABILITY_RAW);
-
assertFalse("Devices supporting external cameras must have a representative camera " +
"connected for testing",
mPackageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_EXTERNAL));
@@ -131,48 +121,9 @@
assertAvailable(PackageManager.FEATURE_CAMERA_ANY);
checkFrontCamera();
checkRearCamera();
- checkCamera2Features();
}
}
- private void checkCamera2Features() throws Exception {
- String[] cameraIds = mCameraManager.getCameraIdList();
- boolean fullCamera = false;
- boolean manualSensor = false;
- boolean manualPostProcessing = false;
- boolean raw = false;
- CameraCharacteristics[] cameraChars = new CameraCharacteristics[cameraIds.length];
- for (String cameraId : cameraIds) {
- CameraCharacteristics chars = mCameraManager.getCameraCharacteristics(cameraId);
- Integer hwLevel = chars.get(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL);
- int[] capabilities = chars.get(CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES);
- if (hwLevel == CameraMetadata.INFO_SUPPORTED_HARDWARE_LEVEL_FULL) {
- fullCamera = true;
- }
- for (int capability : capabilities) {
- switch (capability) {
- case CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR:
- manualSensor = true;
- break;
- case CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING:
- manualPostProcessing = true;
- break;
- case CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_RAW:
- raw = true;
- break;
- default:
- // Capabilities don't have a matching system feature
- break;
- }
- }
- }
- assertFeature(fullCamera, PackageManager.FEATURE_CAMERA_LEVEL_FULL);
- assertFeature(manualSensor, PackageManager.FEATURE_CAMERA_CAPABILITY_MANUAL_SENSOR);
- assertFeature(manualPostProcessing,
- PackageManager.FEATURE_CAMERA_CAPABILITY_MANUAL_POST_PROCESSING);
- assertFeature(raw, PackageManager.FEATURE_CAMERA_CAPABILITY_RAW);
- }
-
private void checkFrontCamera() {
CameraInfo info = new CameraInfo();
int numCameras = Camera.getNumberOfCameras();
@@ -492,12 +443,4 @@
assertFalse("PackageManager#getSystemAvailableFeatures should NOT have " + feature,
mAvailableFeatures.contains(feature));
}
-
- private void assertFeature(boolean exist, String feature) {
- if (exist) {
- assertAvailable(feature);
- } else {
- assertNotAvailable(feature);
- }
- }
}
