Merge "hwc: Fix null dereference"
diff --git a/libhwcomposer/hwc_utils.cpp b/libhwcomposer/hwc_utils.cpp
index 4447cfd..a0cbc68 100644
--- a/libhwcomposer/hwc_utils.cpp
+++ b/libhwcomposer/hwc_utils.cpp
@@ -273,9 +273,15 @@
//independent process as well.
QService::init();
sp<IQClient> client = new QClient(ctx);
- interface_cast<IQService>(
+ android::sp<qService::IQService> qservice_sp = interface_cast<IQService>(
defaultServiceManager()->getService(
- String16("display.qservice")))->connect(client);
+ String16("display.qservice")));
+ if (qservice_sp.get()) {
+ qservice_sp->connect(client);
+ } else {
+ ALOGE("%s: Failed to acquire service pointer", __FUNCTION__);
+ return ;
+ }
// Initialize device orientation to its default orientation
ctx->deviceOrientation = 0;