diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/CompositionRefreshArgs.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/CompositionRefreshArgs.h
index 8039bba..f861fc9 100644
--- a/services/surfaceflinger/CompositionEngine/include/compositionengine/CompositionRefreshArgs.h
+++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/CompositionRefreshArgs.h
@@ -33,6 +33,8 @@
 using Outputs = std::vector<std::shared_ptr<compositionengine::Output>>;
 
 struct BorderRenderInfo {
+    float width = 0;
+    half4 color;
     std::vector<int32_t> layerIds;
 };
 /**
diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp
index 430d673..c65191c 100644
--- a/services/surfaceflinger/CompositionEngine/src/Output.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp
@@ -753,8 +753,13 @@
         for (const auto& id : borderInfo.layerIds) {
             info.combinedRegion.orSelf(*(layerVisibleRegionMap[id]));
         }
-        outputCompositionState.borderInfoList.emplace_back(std::move(info));
-        clientComposeTopLayer |= !info.combinedRegion.isEmpty();
+
+        if (!info.combinedRegion.isEmpty()) {
+            info.width = borderInfo.width;
+            info.color = borderInfo.color;
+            outputCompositionState.borderInfoList.emplace_back(std::move(info));
+            clientComposeTopLayer = true;
+        }
     }
 
     // In this situation we must client compose the top layer instead of using hwc
@@ -1218,6 +1223,8 @@
     clientCompositionDisplay.colorTransform = outputState.colorTransformMatrix;
     for (auto& info : outputState.borderInfoList) {
         renderengine::BorderRenderInfo borderInfo;
+        borderInfo.width = info.width;
+        borderInfo.color = info.color;
         borderInfo.combinedRegion = info.combinedRegion;
         clientCompositionDisplay.borderInfoList.emplace_back(std::move(borderInfo));
     }
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index d47e423..2d3b237 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -1157,11 +1157,13 @@
     return StretchEffect{};
 }
 
-bool Layer::enableBorder(bool shouldEnable) {
-    if (mBorderEnabled == shouldEnable) {
+bool Layer::enableBorder(bool shouldEnable, float width, const half4& color) {
+    if (mBorderEnabled == shouldEnable && mBorderWidth == width && mBorderColor == color) {
         return false;
     }
     mBorderEnabled = shouldEnable;
+    mBorderWidth = width;
+    mBorderColor = color;
     return true;
 }
 
@@ -1169,6 +1171,14 @@
     return mBorderEnabled;
 }
 
+float Layer::getBorderWidth() {
+    return mBorderWidth;
+}
+
+const half4& Layer::getBorderColor() {
+    return mBorderColor;
+}
+
 bool Layer::propagateFrameRateForLayerTree(FrameRate parentFrameRate, bool* transactionNeeded) {
     // The frame rate for layer tree is this layer's frame rate if present, or the parent frame rate
     const auto frameRate = [&] {
diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h
index 85187e1..60c97f9 100644
--- a/services/surfaceflinger/Layer.h
+++ b/services/surfaceflinger/Layer.h
@@ -895,8 +895,10 @@
 
     bool setStretchEffect(const StretchEffect& effect);
     StretchEffect getStretchEffect() const;
-    bool enableBorder(bool shouldEnable);
+    bool enableBorder(bool shouldEnable, float width, const half4& color);
     bool isBorderEnabled();
+    float getBorderWidth();
+    const half4& getBorderColor();
 
     virtual bool setBufferCrop(const Rect& /* bufferCrop */) { return false; }
     virtual bool setDestinationFrame(const Rect& /* destinationFrame */) { return false; }
@@ -1149,6 +1151,8 @@
     bool findInHierarchy(const sp<Layer>&);
 
     bool mBorderEnabled = false;
+    float mBorderWidth;
+    half4 mBorderColor;
 };
 
 std::ostream& operator<<(std::ostream& stream, const Layer::FrameRate& rate);
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 1d5d353..82d8580 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2179,6 +2179,8 @@
         mDrawingState.traverse([&refreshArgs](Layer* layer) {
             if (layer->isBorderEnabled()) {
                 compositionengine::BorderRenderInfo info;
+                info.width = layer->getBorderWidth();
+                info.color = layer->getBorderColor();
                 layer->traverse(LayerVector::StateSet::Drawing, [&info](Layer* ilayer) {
                     info.layerIds.push_back(ilayer->getSequence());
                 });
@@ -4462,7 +4464,7 @@
         if (layer->setBlurRegions(s.blurRegions)) flags |= eTraversalNeeded;
     }
     if (what & layer_state_t::eRenderBorderChanged) {
-        if (layer->enableBorder(s.borderEnabled)) {
+        if (layer->enableBorder(s.borderEnabled, s.borderWidth, s.borderColor)) {
             flags |= eTraversalNeeded;
         }
     }
diff --git a/services/surfaceflinger/tests/LayerBorder_test.cpp b/services/surfaceflinger/tests/LayerBorder_test.cpp
index 4b38214..f80c705 100644
--- a/services/surfaceflinger/tests/LayerBorder_test.cpp
+++ b/services/surfaceflinger/tests/LayerBorder_test.cpp
@@ -36,7 +36,7 @@
 
         const auto display = SurfaceComposerClient::getInternalDisplayToken();
         ASSERT_FALSE(display == nullptr);
-
+        mColorOrange = toHalf4({255, 140, 0, 255});
         mParentLayer = createColorLayer("Parent layer", Color::RED);
 
         mContainerLayer = mClient->createSurface(String8("Container Layer"), 0 /* width */,
@@ -82,6 +82,7 @@
     std::function<half3(Color)> toHalf3;
     std::function<half4(Color)> toHalf4;
     sp<SurfaceControl> mParentLayer, mContainerLayer, mEffectLayer1, mEffectLayer2;
+    half4 mColorOrange;
 };
 
 TEST_F(LayerBorderTest, OverlappingVisibleRegions) {
@@ -89,7 +90,7 @@
         t.setCrop(mEffectLayer1, Rect(0, 0, 400, 400));
         t.setCrop(mEffectLayer2, Rect(200, 200, 600, 600));
 
-        t.enableBorder(mContainerLayer, true);
+        t.enableBorder(mContainerLayer, true, 20, mColorOrange);
         t.show(mEffectLayer1);
         t.show(mEffectLayer2);
         t.show(mContainerLayer);
@@ -101,7 +102,7 @@
         t.setCrop(mEffectLayer1, Rect(0, 0, 400, 400));
         t.setCrop(mEffectLayer2, Rect(200, 200, 600, 600));
 
-        t.enableBorder(mEffectLayer1, true);
+        t.enableBorder(mEffectLayer1, true, 20, mColorOrange);
         t.show(mEffectLayer1);
         t.show(mEffectLayer2);
         t.show(mContainerLayer);
@@ -113,7 +114,7 @@
         t.setCrop(mEffectLayer1, Rect(0, 0, 200, 200));
         t.setCrop(mEffectLayer2, Rect(400, 400, 600, 600));
 
-        t.enableBorder(mContainerLayer, true);
+        t.enableBorder(mContainerLayer, true, 20, mColorOrange);
         t.show(mEffectLayer1);
         t.show(mEffectLayer2);
         t.show(mContainerLayer);
@@ -125,7 +126,7 @@
         t.setCrop(mEffectLayer1, Rect(200, 200, 400, 400));
         t.setCrop(mEffectLayer2, Rect(0, 0, 600, 600));
 
-        t.enableBorder(mEffectLayer1, true);
+        t.enableBorder(mEffectLayer1, true, 20, mColorOrange);
         t.show(mEffectLayer1);
         t.show(mEffectLayer2);
         t.show(mContainerLayer);
@@ -140,7 +141,7 @@
         t.setLayer(mEffectLayer1, 30);
         t.setLayer(mEffectLayer2, 20);
 
-        t.enableBorder(mEffectLayer1, true);
+        t.enableBorder(mEffectLayer1, true, 20, mColorOrange);
         t.show(mEffectLayer1);
         t.show(mEffectLayer2);
         t.show(mContainerLayer);
@@ -169,7 +170,7 @@
         t.setCrop(effectLayer3, Rect(400, 400, 800, 800));
         t.setColor(effectLayer3, toHalf3(Color::BLUE));
 
-        t.enableBorder(mContainerLayer, true);
+        t.enableBorder(mContainerLayer, true, 20, mColorOrange);
         t.show(mEffectLayer1);
         t.show(mEffectLayer2);
         t.show(effectLayer3);
@@ -183,7 +184,7 @@
         t.setCrop(mEffectLayer2, Rect(200, 200, 600, 600));
         t.setAlpha(mEffectLayer1, 0.0f);
 
-        t.enableBorder(mEffectLayer1, true);
+        t.enableBorder(mContainerLayer, true, 20, mColorOrange);
         t.show(mEffectLayer1);
         t.show(mEffectLayer2);
         t.show(mContainerLayer);
@@ -196,7 +197,7 @@
         t.setCrop(mEffectLayer2, Rect(200, 200, 600, 600));
         t.setAlpha(mEffectLayer2, 0.5f);
 
-        t.enableBorder(mEffectLayer2, true);
+        t.enableBorder(mEffectLayer2, true, 20, mColorOrange);
         t.show(mEffectLayer1);
         t.show(mEffectLayer2);
         t.show(mContainerLayer);
@@ -208,7 +209,7 @@
         t.setCrop(mEffectLayer1, Rect(0, 0, 400, 400));
         t.setCrop(mEffectLayer2, Rect(200, 200, 600, 600));
 
-        t.enableBorder(mContainerLayer, true);
+        t.enableBorder(mContainerLayer, true, 20, mColorOrange);
         t.hide(mEffectLayer2);
         t.show(mContainerLayer);
     });
@@ -237,7 +238,43 @@
         t.setBuffer(bufferStateLayer, buffer);
         t.setPosition(bufferStateLayer, 100, 100);
         t.show(bufferStateLayer);
-        t.enableBorder(mContainerLayer, true);
+        t.enableBorder(mContainerLayer, true, 20, mColorOrange);
+    });
+}
+
+TEST_F(LayerBorderTest, CustomWidth) {
+    asTransaction([&](Transaction& t) {
+        t.setCrop(mEffectLayer1, Rect(0, 0, 400, 400));
+        t.setCrop(mEffectLayer2, Rect(200, 200, 600, 600));
+
+        t.enableBorder(mContainerLayer, true, 50, mColorOrange);
+        t.show(mEffectLayer1);
+        t.show(mEffectLayer2);
+        t.show(mContainerLayer);
+    });
+}
+
+TEST_F(LayerBorderTest, CustomColor) {
+    asTransaction([&](Transaction& t) {
+        t.setCrop(mEffectLayer1, Rect(0, 0, 400, 400));
+        t.setCrop(mEffectLayer2, Rect(200, 200, 600, 600));
+
+        t.enableBorder(mContainerLayer, true, 20, toHalf4({255, 0, 255, 255}));
+        t.show(mEffectLayer1);
+        t.show(mEffectLayer2);
+        t.show(mContainerLayer);
+    });
+}
+
+TEST_F(LayerBorderTest, CustomWidthAndColorAndOpacity) {
+    asTransaction([&](Transaction& t) {
+        t.setCrop(mEffectLayer1, Rect(0, 0, 200, 200));
+        t.setCrop(mEffectLayer2, Rect(400, 400, 600, 600));
+
+        t.enableBorder(mContainerLayer, true, 40, toHalf4({255, 255, 0, 128}));
+        t.show(mEffectLayer1);
+        t.show(mEffectLayer2);
+        t.show(mContainerLayer);
     });
 }