commit 916b036726e2e82f769405d25bf6b8248572246c
author Robert Carr <racarr@google.com> Tue Oct 06 13:53:03 2020 -0700
committer Robert Carr <racarr@google.com> Wed Oct 07 16:13:45 2020 -0700
tree b431c4921ae739367dcac4d862c29c83ad765623
parent b52d4c4d3a1272a9ca9873f68de41f0cd4823c24

SurfaceControl: Remove setOverrideScalingMode

Following recent frameworks/base changes there are no callers.

Bug: 161937501
Test: Existing tests pass
Change-Id: I1a39d30ebd70a0b0cb430a6d1ae48086c3e1806e

services/surfaceflinger/LayerRejecter.cpp

diff --git a/services/surfaceflinger/LayerRejecter.cpp b/services/surfaceflinger/LayerRejecter.cpp
index e6c8654..053b7f7 100644
--- a/services/surfaceflinger/LayerRejecter.cpp
+++ b/services/surfaceflinger/LayerRejecter.cpp
@@ -29,13 +29,12 @@
 
 LayerRejecter::LayerRejecter(Layer::State& front, Layer::State& current,
                              bool& recomputeVisibleRegions, bool stickySet, const std::string& name,
-                             int32_t overrideScalingMode, bool transformToDisplayInverse)
+                             bool transformToDisplayInverse)
       : mFront(front),
         mCurrent(current),
         mRecomputeVisibleRegions(recomputeVisibleRegions),
         mStickyTransformSet(stickySet),
         mName(name),
-        mOverrideScalingMode(overrideScalingMode),
         mTransformToDisplayInverse(transformToDisplayInverse) {}
 
 bool LayerRejecter::reject(const sp<GraphicBuffer>& buf, const BufferItem& item) {
@@ -59,7 +58,7 @@
         }
     }
 
-    int actualScalingMode = mOverrideScalingMode >= 0 ? mOverrideScalingMode : item.mScalingMode;
+    int actualScalingMode = item.mScalingMode;
     bool isFixedSize = actualScalingMode != NATIVE_WINDOW_SCALING_MODE_FREEZE;
     if (mFront.active_legacy != mFront.requested_legacy) {
         if (isFixedSize ||