am 2f45d69d: am c168393b: am 3fd1ada4: Merge "Disable layer leak tracking" into lmp-dev

* commit '2f45d69d3374838839a0db7fa7dd9fb0ddbe2825':
  Disable layer leak tracking

libs/hwui/RenderState.cpp

@@ -38,6 +38,7 @@ void RenderState::onGLContextCreated() {
 }
 
 void RenderState::onGLContextDestroyed() {
+/*
     AutoMutex _lock(mLayerLock);
     size_t size = mActiveLayers.size();
     if (CC_UNLIKELY(size != 0)) {
@@ -68,6 +69,7 @@ void RenderState::onGLContextDestroyed() {
         }
         LOG_ALWAYS_FATAL("%d layers have survived gl context destruction", size);
     }
+*/
 }
 
 void RenderState::setViewport(GLsizei width, GLsizei height) {

libs/hwui/RenderState.h

@@ -53,12 +53,16 @@ public:
     void debugOverdraw(bool enable, bool clear);
 
     void registerLayer(const Layer* layer) {
+        /*
         AutoMutex _lock(mLayerLock);
         mActiveLayers.insert(layer);
+        */
     }
     void unregisterLayer(const Layer* layer) {
+        /*
         AutoMutex _lock(mLayerLock);
         mActiveLayers.erase(layer);
+        */
     }
 
     void registerCanvasContext(renderthread::CanvasContext* context) {