diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2016-10-21 17:06:50 -0700 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2016-10-28 11:15:04 -0700 |
| commit | 4574cbd7578d23fbe9046e7e8bf19260315edda9 (patch) | |
| tree | 9d7ae3300f706cb72bfe360f5ca3cb6e4fab680f | |
| parent | e129b7b3f1282ea7472fb9d2629ace2678170f48 (diff) | |
| download | cts-4574cbd7578d23fbe9046e7e8bf19260315edda9.tar.gz | |
DO NOT MERGE: CameraITS: do not create a key that doesn't existandroid-7.1.1_r1
Test: compare the output of "python
tests/scene0/test_camera_properties.py"
Bug: 32305654
Bug: 32451173
Change-Id: Ibcdccda85ca8f233e5c8c7dd36cae8703b761e78
(cherry picked from commit aaa212420dd7326f187b2804d1e9391bc059e8ee)
| -rw-r--r-- | apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsSerializer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsSerializer.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsSerializer.java index 193c94c01ad..2a6c146cc92 100644 --- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsSerializer.java +++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsSerializer.java @@ -371,7 +371,7 @@ public class ItsSerializer { try { Object keyValue = getKeyValue(md, keyObj); if (keyValue == null) { - return new MetadataEntry(keyName, JSONObject.NULL); + return null; } int arrayLen = Array.getLength(keyValue); Type elmtType = ((GenericArrayType)keyType).getGenericComponentType(); |