From 01b5b8d4a415850d01d9b07b406fb268b675da14 Mon Sep 17 00:00:00 2001
From: Stark Li<stark.li@amlogic.com>
Date: Thu, 06  Apr  2017  07:55:17  +0000
Subject: PD#142201: Monkey test bad layer error

Change-Id: I29e2f01339fcb1316feb278c8bf9b4fd88886222
---
diff --git a/hwc2/common/devices/PhysicalDevice.cpp b/hwc2/common/devices/PhysicalDevice.cpp
index bc15689..e07c16a 100644
--- a/hwc2/common/devices/PhysicalDevice.cpp
+++ b/hwc2/common/devices/PhysicalDevice.cpp
@@ -75,12 +75,12 @@ PhysicalDevice::PhysicalDevice(hwc2_display_t id, Hwcomposer& hwc, DeviceControl
     initDisplay();
 
     // set capacity of layers, layer's changed type, layer's changed request.
-    mHwcLayersChangeType.setCapacity(LAYER_MAX_NUM_CHANGE_TYPE);
-    mHwcLayersChangeRequest.setCapacity(LAYER_MAX_NUM_CHANGE_REQUEST);
-    mHwcGlesLayers.setCapacity(LAYER_MAX_NUM_CHANGE_TYPE);
-    mHwcLayers.setCapacity(LAYER_MAX_NUM_SUPPORT);
+    // mHwcLayersChangeType.setCapacity(LAYER_MAX_NUM_CHANGE_TYPE);
+    // mHwcLayersChangeRequest.setCapacity(LAYER_MAX_NUM_CHANGE_REQUEST);
+    // mHwcGlesLayers.setCapacity(LAYER_MAX_NUM_CHANGE_TYPE);
+    // mHwcLayers.setCapacity(LAYER_MAX_NUM_SUPPORT);
 #ifdef HWC_ENABLE_SECURE_LAYER
-    mHwcSecureLayers.setCapacity(LAYER_MAX_NUM_SECURE_PROTECTED);
+    // mHwcSecureLayers.setCapacity(LAYER_MAX_NUM_SECURE_PROTECTED);
     mHwcSecureLayers.clear();
 #endif
 
@@ -90,7 +90,7 @@ PhysicalDevice::PhysicalDevice(hwc2_display_t id, Hwcomposer& hwc, DeviceControl
     mHwcGlesLayers.clear();
     mHwcLayers.clear();
 
-    mGE2DRenderSortedLayerIds.setCapacity(HWC2_MAX_LAYERS);
+    // mGE2DRenderSortedLayerIds.setCapacity(HWC2_MAX_LAYERS);
     mGE2DRenderSortedLayerIds.clear();
 
     mHwcCurReleaseFences = mHwcPriorReleaseFences = NULL;
@@ -238,13 +238,14 @@ bool PhysicalDevice::createLayer(hwc2_layer_t* outLayer) {
     hwc2_layer_t layerId = reinterpret_cast<hwc2_layer_t>(layer);
     mHwcLayers.add(layerId, layer);
     *outLayer = layerId;
-    ETRACE("layerId %lld.\n", layerId);
+    DTRACE("::createLayer layerId %lld, size: [%d].\n", layerId, mHwcLayers.size());
 
     return true;
 }
 
 bool PhysicalDevice::destroyLayer(hwc2_layer_t layerId) {
     HwcLayer* layer = mHwcLayers.valueFor(layerId);
+    DTRACE("::destroyLayer layerId %lld, size: [%d].\n", layerId, mHwcLayers.size());
 
     if (layer == NULL) {
         ETRACE("destroyLayer: no Hwclayer found (%d)", layerId);
--
cgit