Merge remote-tracking branch 'quic/display.lnx.3.0-rel' into LA.HB.1.3.9
Promotion of display.lnx.3.0-00012.
Change-Id: I58b0815d8446abc5728c5eb5e580cfca9fd15b18
diff --git a/libqservice/IQService.cpp b/libqservice/IQService.cpp
index e4aee7a..f63e411 100644
--- a/libqservice/IQService.cpp
+++ b/libqservice/IQService.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2010 The Android Open Source Project
- * Copyright (C) 2012-2014, The Linux Foundation. All rights reserved.
+ * Copyright (C) 2012-2016, The Linux Foundation. All rights reserved.
*
* Not a Contribution, Apache license notifications and license are
* retained for attribution purposes only.
@@ -97,6 +97,7 @@
const bool permission = (callerUid == AID_MEDIA ||
callerUid == AID_GRAPHICS ||
callerUid == AID_ROOT ||
+ callerUid == AID_CAMERASERVER ||
callerUid == AID_SYSTEM);
if (code == CONNECT_HWC_CLIENT) {
diff --git a/sdm/libs/hwc/Android.mk b/sdm/libs/hwc/Android.mk
index d711366..13502f2 100644
--- a/sdm/libs/hwc/Android.mk
+++ b/sdm/libs/hwc/Android.mk
@@ -24,7 +24,7 @@
ifeq ($(TARGET_USES_QCOM_BSP),true)
# Enable QCOM Display features
-LOCAL_CFLAGS += -DQTI_BSP
+#LOCAL_CFLAGS += -DQTI_BSP
endif
LOCAL_SHARED_LIBRARIES := libsdmcore libqservice libbinder libhardware libhardware_legacy \