summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CleanSpec.mk2
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java6
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java2
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/LegacyVendorTags.java55
-rw-r--r--camera2/portability/tests/src/com/android/ex/camera2/portability/Camera2PortabilityTest.java1
-rw-r--r--camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2DeviceTester.java5
6 files changed, 7 insertions, 64 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk
index b84e1b6..70cc833 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -47,3 +47,5 @@
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
+
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android-ex-camera2-portability_intermediates/)
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java
index 8001a37..9601d03 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Capabilities.java
@@ -223,13 +223,11 @@ public class AndroidCamera2Capabilities extends CameraCapabilities {
return SceneMode.SUNSET;
case CONTROL_SCENE_MODE_THEATRE:
return SceneMode.THEATRE;
+ case CONTROL_SCENE_MODE_HDR:
+ return SceneMode.HDR;
// TODO: We cannot expose FACE_PRIORITY, or HIGH_SPEED_VIDEO
}
- if (sm == LegacyVendorTags.CONTROL_SCENE_MODE_HDR) {
- return SceneMode.HDR;
- }
-
Log.w(TAG, "Unable to convert from API 2 scene mode: " + sm);
return null;
}
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java
index 0062097..cf17072 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java
@@ -429,7 +429,7 @@ public class AndroidCamera2Settings extends CameraSettings {
break;
}
case HDR: {
- mode = LegacyVendorTags.CONTROL_SCENE_MODE_HDR;
+ mode = CONTROL_SCENE_MODE_HDR;
break;
}
case LANDSCAPE: {
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/LegacyVendorTags.java b/camera2/portability/src/com/android/ex/camera2/portability/LegacyVendorTags.java
deleted file mode 100644
index 7eb5c33..0000000
--- a/camera2/portability/src/com/android/ex/camera2/portability/LegacyVendorTags.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.ex.camera2.portability;
-
-import android.hardware.camera2.CameraCharacteristics;
-import android.util.Log;
-
-import java.lang.ExceptionInInitializerError;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-/**
- * Vendor tag declarations for the Legacy Camera2 API implementation.
- */
-public class LegacyVendorTags {
-
- private static final String TAG = "LegacyVendorTags";
-
- /**
- * Hidden enum for scene modes supported only by the Camera1 API.
- */
- public static final int CONTROL_SCENE_MODE_HDR;
-
- static {
- int tempSceneMode = -1;
- try {
- tempSceneMode =
- Class.forName("android.hardware.camera2.CameraCharacteristics").
- getField("CONTROL_SCENE_MODE_HDR").getInt(null);
- } catch (Exception e) {
- Log.e(TAG, "Error while reflecting on SCENE_MODE_HDR enum, HDR will not be available: "
- + e);
- } finally {
- CONTROL_SCENE_MODE_HDR = tempSceneMode;
- }
- }
-
- private LegacyVendorTags() {
- throw new AssertionError();
- }
-} \ No newline at end of file
diff --git a/camera2/portability/tests/src/com/android/ex/camera2/portability/Camera2PortabilityTest.java b/camera2/portability/tests/src/com/android/ex/camera2/portability/Camera2PortabilityTest.java
index 1f340fd..5fed6fb 100644
--- a/camera2/portability/tests/src/com/android/ex/camera2/portability/Camera2PortabilityTest.java
+++ b/camera2/portability/tests/src/com/android/ex/camera2/portability/Camera2PortabilityTest.java
@@ -27,7 +27,6 @@ import android.hardware.camera2.CameraCharacteristics;
import android.hardware.camera2.CameraDevice;
import android.hardware.camera2.CameraManager;
import android.hardware.camera2.CaptureRequest;
-import android.support.test.InjectContext;
import com.android.ex.camera2.portability.CameraCapabilities.FlashMode;
import com.android.ex.camera2.portability.CameraCapabilities.FocusMode;
diff --git a/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2DeviceTester.java b/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2DeviceTester.java
index e8639ba..b6f7bd0 100644
--- a/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2DeviceTester.java
+++ b/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2DeviceTester.java
@@ -21,7 +21,7 @@ import android.hardware.camera2.CameraDevice;
import android.hardware.camera2.CameraManager;
import android.os.Handler;
import android.os.HandlerThread;
-import android.support.test.InjectContext;
+import android.support.test.InstrumentationRegistry;
import org.junit.After;
import org.junit.AfterClass;
@@ -49,8 +49,7 @@ public class Camera2DeviceTester {
sThread.join();
}
- @InjectContext
- public Context mContext;
+ public Context mContext = InstrumentationRegistry.getTargetContext();
private class DeviceCapturer extends CameraDevice.StateCallback {
private CameraDevice mCamera;