commit 1bbe0a4c47997d33ad02192df612ad9f2ef25fed
author Eino-Ville Talvala <etalvala@google.com> Thu Mar 03 21:39:57 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 03 21:39:57 2016 +0000
tree e0e5e5227cb14deac9cf1b830816bcf4dd15e25c
parent 2798f49bb4924960fe2e60ad7bb88e00d0695638
parent b026bb1d9ca239af6f241a3c2c84130767a76564

Merge "Camera: Don\'t crash when the device has no vendor tags." into nyc-dev
am: b026bb1d9c

* commit 'b026bb1d9ca239af6f241a3c2c84130767a76564':
  Camera: Don't crash when the device has no vendor tags.

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 181c473..eacde99 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -660,8 +660,10 @@
         ALOGE("%s: camera hardware module doesn't exist", __FUNCTION__);
         return STATUS_ERROR(ERROR_DISCONNECTED, "Camera subsystem not available");
     }
-
-    *desc = *(VendorTagDescriptor::getGlobalVendorTagDescriptor().get());
+    sp<VendorTagDescriptor> globalDescriptor = VendorTagDescriptor::getGlobalVendorTagDescriptor();
+    if (globalDescriptor != nullptr) {
+        *desc = *(globalDescriptor.get());
+    }
     return Status::ok();
 }