commit b554bff208ec1af8b6a8cfd78a86103c8dd46089
author Bjoern Johansson <bjoernj@google.com> Tue Jan 10 23:18:22 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 10 23:18:23 2017 +0000
tree 09bc070a4a80a20841468e85f38aa7eed018165c
parent a6edcbb2026fe0a75fa55b6763c8d51b49083e47
parent 1a5954c3adc4dd6c265a7f454cc5d94825a0d1ee

Merge "Fix NDK CameraManager crash when no cameras exist"

camera/ndk/impl/ACameraManager.cpp

diff --git a/camera/ndk/impl/ACameraManager.cpp b/camera/ndk/impl/ACameraManager.cpp
index f656008..ba2100c 100644
--- a/camera/ndk/impl/ACameraManager.cpp
+++ b/camera/ndk/impl/ACameraManager.cpp
@@ -335,7 +335,7 @@
         return ACAMERA_ERROR_NOT_ENOUGH_MEMORY;
     }
     out->numCameras = numCameras;
-    out->cameraIds = new const char*[numCameras] {nullptr};
+    out->cameraIds = new const char*[numCameras];
     if (!out->cameraIds) {
         ALOGE("Allocate memory for ACameraIdList failed!");
         deleteCameraIdList(out);