diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java
index 7929112d8d64a..e086f5a3586c6 100644
--- a/core/java/android/view/HardwareRenderer.java
+++ b/core/java/android/view/HardwareRenderer.java
@@ -172,6 +172,19 @@ public abstract class HardwareRenderer {
      */
     public static final String DEBUG_SHOW_OVERDRAW_PROPERTY = "debug.hwui.show_overdraw";
 
+    /**
+     * Turn on to debug non-rectangular clip operations.
+     *
+     * Possible values:
+     * "hide", to disable this debug mode
+     * "highlight", highlight drawing commands tested against a non-rectangular clip
+     * "stencil", renders the clip region on screen when set
+     *
+     * @hide
+     */
+    public static final String DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY =
+            "debug.hwui.show_non_rect_clip";
+
     /**
      * A process can set this flag to false to prevent the use of hardware
      * rendering.
diff --git a/libs/hwui/Properties.h b/libs/hwui/Properties.h
index 4ee16edf36696..b8559bc8eabb5 100644
--- a/libs/hwui/Properties.h
+++ b/libs/hwui/Properties.h
@@ -79,7 +79,7 @@ enum DebugLevel {
  *
  * The default value is "hide".
  */
-#define PROPERTY_DEBUG_STENCIL_CLIP "debug.hwui.show_stencil_clip"
+#define PROPERTY_DEBUG_STENCIL_CLIP "debug.hwui.show_non_rect_clip"
 
 /**
  * Used to enable/disable scissor optimization. The accepted values are