From 7296051995fbaea919480a6cc2dabb729dabc95b Mon Sep 17 00:00:00 2001 From: Jesse Hall Date: Thu, 10 Jan 2013 16:19:56 -0800 Subject: [PATCH] Remove support for legacy HWC version encoding Change-Id: If03ae1ebf10d15777310e1449a57473021390582 --- .../surfaceflinger/DisplayHardware/HWComposer.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp index 31d731eae..8d92bd302 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp +++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp @@ -48,25 +48,15 @@ namespace android { -#define MIN_HWC_HEADER_VERSION 0 +#define MIN_HWC_HEADER_VERSION HWC_HEADER_VERSION static uint32_t hwcApiVersion(const hwc_composer_device_1_t* hwc) { uint32_t hwcVersion = hwc->common.version; - if (MIN_HWC_HEADER_VERSION == 0 && - (hwcVersion & HARDWARE_API_VERSION_2_MAJ_MIN_MASK) == 0) { - // legacy version encoding - hwcVersion <<= 16; - } return hwcVersion & HARDWARE_API_VERSION_2_MAJ_MIN_MASK; } static uint32_t hwcHeaderVersion(const hwc_composer_device_1_t* hwc) { uint32_t hwcVersion = hwc->common.version; - if (MIN_HWC_HEADER_VERSION == 0 && - (hwcVersion & HARDWARE_API_VERSION_2_MAJ_MIN_MASK) == 0) { - // legacy version encoding - hwcVersion <<= 16; - } return hwcVersion & HARDWARE_API_VERSION_2_HEADER_MASK; }