commit 800856a7b7f8d89c1a64955f152549b8f42cd3e0
author Jesse Hall <jessehall@google.com> Mon Jan 14 09:52:16 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 14 09:52:16 2013 -0800
tree ab4cc1fd7238623e687e499fb858bfee21038834
parent c19c15174b1a07c5d18f45f26bee7893481ab41d
parent f3e9d5bde57a41593a7dbc15e6f1fdb1ea64ea74

am f3e9d5bd: am cbe51356: Merge "Remove support for legacy HWC version encoding"

* commit 'f3e9d5bde57a41593a7dbc15e6f1fdb1ea64ea74':
  Remove support for legacy HWC version encoding

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index cd06971..fc0a494 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;
 }