Merge "media: test CamcorderProfile.getAll returning null" into tm-dev
diff --git a/tests/tests/media/misc/src/android/media/misc/cts/CamcorderProfileTest.java b/tests/tests/media/misc/src/android/media/misc/cts/CamcorderProfileTest.java
index a28095f..eab6aeb 100644
--- a/tests/tests/media/misc/src/android/media/misc/cts/CamcorderProfileTest.java
+++ b/tests/tests/media/misc/src/android/media/misc/cts/CamcorderProfileTest.java
@@ -449,6 +449,8 @@
                         CamcorderProfile.getAll(String.valueOf(cameraId), quality);
                     checkAllProfiles(allProfiles, profile, videoSizesToCheck);
                 }
+            } else {
+                assertNull(CamcorderProfile.getAll(String.valueOf(cameraId), quality));
             }
         }