Revert "SurfaceFlinger: Make secure display ifdefs more narrow." (ebbdb553) · Commits · e / devices / smdk4412 / android_frameworks_native

services/surfaceflinger/Android.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -47,10 +47,6 @@ ifeq ($(TARGET_BOARD_PLATFORM),s5pc110)
		LOCAL_CFLAGS += -DHAS_CONTEXT_PRIORITY
		endif

		ifeq ($(TARGET_BOARD_PLATFORM),apq8084)
		LOCAL_CFLAGS += -DAPQ8084
		endif

		ifeq ($(TARGET_DISABLE_TRIPLE_BUFFERING),true)
		LOCAL_CFLAGS += -DTARGET_DISABLE_TRIPLE_BUFFERING
		endif

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -179,7 +179,7 @@ HWComposer::HWComposer(
		config.height = mFbDev->height;
		config.xdpi = mFbDev->xdpi;
		config.ydpi = mFbDev->ydpi;
		#if defined(QCOM_BSP) && !defined(APQ8084)
		#ifdef QCOM_BSP
		config.secure = true; //XXX: Assuming primary is always true
		#endif
		config.refresh = nsecs_t(1e9 / mFbDev->fps);
		@@ -353,7 +353,7 @@ static const uint32_t DISPLAY_ATTRIBUTES[] = {
		HWC_DISPLAY_HEIGHT,
		HWC_DISPLAY_DPI_X,
		HWC_DISPLAY_DPI_Y,
		#if defined(QCOM_BSP) && !defined(APQ8084)
		#ifdef QCOM_BSP
		//To specify if display is secure
		//Primary is considered as secure always
		//HDMI can be secure based on HDCP
		@@ -414,7 +414,7 @@ status_t HWComposer::queryDisplayProperties(int disp) {
		case HWC_DISPLAY_DPI_Y:
		config.ydpi = values[i] / 1000.0f;
		break;
		#if defined(QCOM_BSP) && !defined(APQ8084)
		#ifdef QCOM_BSP
		case HWC_DISPLAY_SECURE:
		config.secure = values[i];
		break;
		@@ -530,7 +530,7 @@ float HWComposer::getDpiY(int disp) const {
		return mDisplayData[disp].configs[currentConfig].ydpi;
		}

		#if defined(QCOM_BSP) && !defined(APQ8084)
		#ifdef QCOM_BSP
		bool HWComposer::isSecure(int disp) const {
		size_t currentConfig = mDisplayData[disp].currentConfig;
		return mDisplayData[disp].configs[currentConfig].secure;
		@@ -1266,7 +1266,7 @@ void HWComposer::dump(String8& result) const {
		result.appendFormat(" Display[%zd] configurations (* current):\n", i);
		for (size_t c = 0; c < disp.configs.size(); ++c) {
		const DisplayConfig& config(disp.configs[c]);
		#if defined(QCOM_BSP) && !defined(APQ8084)
		#ifdef QCOM_BSP
		result.appendFormat(" %s%zd: %ux%u, xdpi=%f, ydpi=%f, secure=%d refresh=%" PRId64 "\n",
		c == disp.currentConfig ? "* " : "", c, config.width, config.height,
		config.xdpi, config.ydpi, config.secure, config.refresh);

services/surfaceflinger/DisplayHardware/HWComposer.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -276,7 +276,7 @@ public:
		uint32_t height;
		float xdpi;
		float ydpi;
		#if defined(QCOM_BSP) && !defined(APQ8084)
		#ifdef QCOM_BSP
		bool secure;
		#endif
		nsecs_t refresh;
		@@ -288,7 +288,7 @@ public:
		sp<Fence> getDisplayFence(int disp) const;
		uint32_t getFormat(int disp) const;
		bool isConnected(int disp) const;
		#if defined(QCOM_BSP) && !defined(APQ8084)
		#ifdef QCOM_BSP
		bool isSecure(int disp) const;
		#endif

services/surfaceflinger/SurfaceFlinger.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -452,7 +452,7 @@ void SurfaceFlinger::init() {
		DisplayDevice::DisplayType type((DisplayDevice::DisplayType)i);
		// set-up the displays that are already connected
		if (mHwc->isConnected(i) \|\| type==DisplayDevice::DISPLAY_PRIMARY) {
		#if defined(QCOM_BSP) && !defined(APQ8084)
		#ifdef QCOM_BSP
		// query from hwc if the non-virtual display is secure.
		bool isSecure = mHwc->isSecure(i);;
		#else
		@@ -648,7 +648,7 @@ status_t SurfaceFlinger::getDisplayConfigs(const sp<IBinder>& display,
		info.presentationDeadline =
		hwConfig.refresh - SF_VSYNC_EVENT_PHASE_OFFSET_NS + 1000000;

		#if defined(QCOM_BSP) && !defined(APQ8084)
		#ifdef QCOM_BSP
		// set secure info based on the hwcConfig
		info.secure = hwConfig.secure;
		#else
		@@ -866,7 +866,7 @@ void SurfaceFlinger::onHotplugReceived(int type, bool connected) {
		if (uint32_t(type) < DisplayDevice::NUM_BUILTIN_DISPLAY_TYPES) {
		Mutex::Autolock _l(mStateLock);
		if (connected) {
		#if defined(QCOM_BSP) && !defined(APQ8084)
		#ifdef QCOM_BSP
		// query from hwc if the connected display is secure
		bool secure = mHwc->isSecure(type);;
		#else