From 74c9cc3112a172d9d637d12e5e257e60c11ba956 Mon Sep 17 00:00:00 2001
From: Yiwei Zhang <zzyiwei@google.com>
Date: Sat, 20 Jun 2020 03:35:17 -0700
Subject: libgui: align the Surface default mMaxBufferCount value with
 BufferQueue

Bug: 159213110
Bug: 159505775
Test: atest libgui_test:SurfaceTest#DefaultMaxBufferCountSetAndUpdated
Change-Id: Ia4f781e0715b3a4e55c598595746bc0d5c76e3ef
---
 libs/gui/Surface.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'libs/gui/Surface.cpp')

diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp
index 2bf8ff7581..cf269b33ba 100644
--- a/libs/gui/Surface.cpp
+++ b/libs/gui/Surface.cpp
@@ -110,7 +110,7 @@ Surface::Surface(const sp<IGraphicBufferProducer>& bufferProducer, bool controll
     mConnectedToCpu = false;
     mProducerControlledByApp = controlledByApp;
     mSwapIntervalZero = false;
-    mMaxBufferCount = 0;
+    mMaxBufferCount = NUM_BUFFER_SLOTS;
 }
 
 Surface::~Surface() {
@@ -1585,6 +1585,7 @@ int Surface::disconnect(int api, IGraphicBufferProducer::DisconnectMode mode) {
         mStickyTransform = 0;
         mAutoPrerotation = false;
         mEnableFrameTimestamps = false;
+        mMaxBufferCount = NUM_BUFFER_SLOTS;
 
         if (api == NATIVE_WINDOW_API_CPU) {
             mConnectedToCpu = false;
-- 
cgit v1.2.3-59-g8ed1b