Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5d12af8 authored by Surbhi Kadam's avatar Surbhi Kadam Committed by Android (Google) Code Review
Browse files

Merge "rename surfaceflinger flag set_distinct_corner_radii to... 

Merge "rename surfaceflinger flag set_distinct_corner_radii to set_client_drawn_corner_radii" into main
parents 91ed5311 e1d23b8d

core/java/android/view/SurfaceControl.java

+5 −5
Original line number Diff line number Diff line
@@ -3837,9 +3837,9 @@ public final class SurfaceControl implements Parcelable { 
                                + " , bottomRight=" + bottomRight);

            }



            if (!com.android.graphics.surfaceflinger.flags.Flags.setDistinctCornerRadii()) {

            if (!com.android.graphics.surfaceflinger.flags.Flags.setClientDrawnCornerRadii()) {

                Log.w(TAG, "setCornerRadius was called but"

                           + "set_distinct_corner_radii flag is disabled");

                           + "set_client_drawn_corner_radii flag is disabled");

                return this;

            }

            nativeSetCornerRadius(mNativeObject, sc.mNativeObject,
@@ -3901,9 +3901,9 @@ public final class SurfaceControl implements Parcelable { 
                                + ", bottomLeft=" + bottomLeft

                                + " , bottomRight=" + bottomRight);

            }

            if (!com.android.graphics.surfaceflinger.flags.Flags.setDistinctCornerRadii()) {

                Log.w(TAG, "setCornerRadius was called but"

                           + "set_distinct_corner_radii flag is disabled");

            if (!com.android.graphics.surfaceflinger.flags.Flags.setClientDrawnCornerRadii()) {

                Log.w(TAG, "setClientDrawnCornerRadius was called but"

                           + "set_client_drawn_corner_radii flag is disabled");

                return this;

            }