camera_metadata: Rename CameraProperties to CameraCharacteristics
Bug: 10360518
Change-Id: Ib152a751fed07250c8f211b25469560ef05f1107
diff --git a/camera/docs/CameraPropertiesKeys.mako b/camera/docs/CameraCharacteristicsKeys.mako
similarity index 94%
rename from camera/docs/CameraPropertiesKeys.mako
rename to camera/docs/CameraCharacteristicsKeys.mako
index ee10f45..5d2d7e4 100644
--- a/camera/docs/CameraPropertiesKeys.mako
+++ b/camera/docs/CameraCharacteristicsKeys.mako
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
##
-<%include file="CameraMetadataKeys.mako" args="java_class='CameraProperties', xml_kind='static'" />
+<%include file="CameraMetadataKeys.mako" args="java_class='CameraCharacteristics', xml_kind='static'" />
diff --git a/camera/docs/CameraPropertiesTest.mako b/camera/docs/CameraCharacteristicsTest.mako
similarity index 81%
rename from camera/docs/CameraPropertiesTest.mako
rename to camera/docs/CameraCharacteristicsTest.mako
index 129b90a..80cb31e 100644
--- a/camera/docs/CameraPropertiesTest.mako
+++ b/camera/docs/CameraCharacteristicsTest.mako
@@ -18,24 +18,24 @@
/**
* ! Do not edit this file directly !
*
- * Generated automatically from system/media/camera/docs/CameraPropertiesTest.mako.
- * This file contains only the auto-generated CameraProperties CTS tests; it does
+ * Generated automatically from system/media/camera/docs/CameraCharacteristicsTest.mako.
+ * This file contains only the auto-generated CameraCharacteristics CTS tests; it does
* not contain any additional manual tests, which would be in a separate file.
*/
package android.hardware.camera2.cts;
import android.content.Context;
+import android.hardware.camera2.CameraCharacteristics;
import android.hardware.camera2.CameraDevice;
import android.hardware.camera2.CameraManager;
-import android.hardware.camera2.CameraProperties;
import android.os.Handler;
import android.test.AndroidTestCase;
/**
- * Auto-generated CTS test for CameraProperties fields.
+ * Auto-generated CTS test for CameraCharacteristics fields.
*/
-public class CameraPropertiesTest extends AndroidTestCase {
+public class CameraCharacteristicsTest extends AndroidTestCase {
private CameraManager mCameraManager;
private CameraTestThread mLooperThread;
@@ -67,12 +67,12 @@
% for entry in find_unique_entries(sec):
% if entry.kind == 'static' and entry.visibility == "public":
- public void testCameraProperties${pascal_case(entry.name)}() throws Exception {
+ public void testCameraCharacteristics${pascal_case(entry.name)}() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
assertNotNull("Failed to open camera", camera);
- CameraProperties props;
+ CameraCharacteristics props;
try {
props = camera.getProperties();
}
@@ -82,7 +82,7 @@
assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: ${entry.name}",
- props.get(CameraProperties.${jkey_identifier(entry.name)}));
+ props.get(CameraCharacteristics.${jkey_identifier(entry.name)}));
}
}
% endif
diff --git a/camera/docs/CameraMetadataEnums.mako b/camera/docs/CameraMetadataEnums.mako
index 831d61d..a4bc8c7 100644
--- a/camera/docs/CameraMetadataEnums.mako
+++ b/camera/docs/CameraMetadataEnums.mako
@@ -77,7 +77,7 @@
##
## Static properties only
-${single_kind_keys('static','CameraProperties')}\
+${single_kind_keys('static','CameraCharacteristics')}\
##
## Controls properties only
${single_kind_keys('controls','CaptureRequest')}\
diff --git a/camera/docs/CameraMetadataKeys.mako b/camera/docs/CameraMetadataKeys.mako
index a390431..5e2f1c5 100644
--- a/camera/docs/CameraMetadataKeys.mako
+++ b/camera/docs/CameraMetadataKeys.mako
@@ -16,7 +16,7 @@
##
\
## These sections of metadata Key definitions are inserted into the middle of
-## android.hardware.camera2.CameraProperties, CaptureRequest, and CaptureResult.
+## android.hardware.camera2.CameraCharacteristics, CaptureRequest, and CaptureResult.
<%page args="java_class, xml_kind" />\
/*@O~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~
* The key entries below this point are generated from metadata
@@ -72,7 +72,7 @@
</%def>\
##
## Static properties only
-##${single_kind_keys('CameraPropertiesKeys', 'static')}
+##${single_kind_keys('CameraCharacteristicsKeys', 'static')}
##
## Controls properties only
##${single_kind_keys('CaptureRequestKeys', 'controls')}
diff --git a/camera/docs/metadata-generate b/camera/docs/metadata-generate
index 9b17b2c..85c1809 100755
--- a/camera/docs/metadata-generate
+++ b/camera/docs/metadata-generate
@@ -21,7 +21,10 @@
# docs.html
# ../src/camera_metadata_tag_info.c
# ../src/camera_metadata_tags.h
-# ../../../../cts/tests/tests/hardware/src/android/hardware/camera2/cts/CameraPropertiesTest.java
+# ../../../../cts/tests/tests/hardware/src/android/hardware/camera2/cts/CameraCharacteristicsTest.java
+# ../../../../frameworks/base/core/java/android/hardware/camera2/CameraCharacteristics.java
+# ../../../../frameworks/base/core/java/android/hardware/camera2/CaptureRequest.java
+# ../../../../frameworks/base/core/java/android/hardware/camera2/CaptureResult.java
if [[ -z $ANDROID_BUILD_TOP ]]; then
echo "Please source build/envsetup.sh before running script" >& 2
@@ -163,17 +166,17 @@
# Generate Java API definitions
mkdir -p "${outdir}"
gen_file_abs CameraMetadataEnums.mako "$outdir/CameraMetadataEnums.java.part" no || exit 1
-gen_file_abs CameraPropertiesKeys.mako "$outdir/CameraPropertiesKeys.java.part" no || exit 1
+gen_file_abs CameraCharacteristicsKeys.mako "$outdir/CameraCharacteristicsKeys.java.part" no || exit 1
gen_file_abs CaptureRequestKeys.mako "$outdir/CaptureRequestKeys.java.part" no || exit 1
gen_file_abs CaptureResultKeys.mako "$outdir/CaptureResultKeys.java.part" no || exit 1
insert_file "$outdir/CameraMetadataEnums.java.part" "$fwkdir/CameraMetadata.java" || exit 1
-insert_file "$outdir/CameraPropertiesKeys.java.part" "$fwkdir/CameraProperties.java" || exit 1
+insert_file "$outdir/CameraCharacteristicsKeys.java.part" "$fwkdir/CameraCharacteristics.java" || exit 1
insert_file "$outdir/CaptureRequestKeys.java.part" "$fwkdir/CaptureRequest.java" || exit 1
insert_file "$outdir/CaptureResultKeys.java.part" "$fwkdir/CaptureResult.java" || exit 1
# Generate CTS tests
-gen_file_abs CameraPropertiesTest.mako "$ctsdir/CameraPropertiesTest.java" || exit 1
+gen_file_abs CameraCharacteristicsTest.mako "$ctsdir/CameraCharacteristicsTest.java" || exit 1
echo ""
echo "===================================================="