diff options
| -rw-r--r-- | AconfigFlags.bp | 7 | ||||
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | graphics/java/Android.bp | 6 | ||||
| -rw-r--r-- | graphics/java/android/framework_graphics.aconfig | 8 | ||||
| -rw-r--r-- | graphics/java/android/graphics/Path.java | 4 |
5 files changed, 26 insertions, 1 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index bfb0754a2f9c..fd9915751695 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -37,6 +37,7 @@ aconfig_srcjars = [ ":sdk_sandbox_flags_lib{.generated_srcjars}", ":android.permission.flags-aconfig-java{.generated_srcjars}", ":hwui_flags_java_lib{.generated_srcjars}", + ":framework_graphics_flags_java_lib{.generated_srcjars}", ":display_flags_lib{.generated_srcjars}", ":com.android.internal.foldables.flags-aconfig-java{.generated_srcjars}", ":android.multiuser.flags-aconfig-java{.generated_srcjars}", @@ -353,6 +354,12 @@ java_aconfig_library { defaults: ["framework-minus-apex-aconfig-java-defaults"], } +java_aconfig_library { + name: "framework_graphics_flags_java_lib", + aconfig_declarations: "framework_graphics_flags", + defaults: ["framework-minus-apex-aconfig-java-defaults"], +} + // Display java_aconfig_library { name: "display_flags_lib", diff --git a/core/api/current.txt b/core/api/current.txt index 20424beb2447..6bab30c60b19 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -16309,7 +16309,7 @@ package android.graphics { method public void arcTo(float, float, float, float, float, float, boolean); method public void close(); method @Deprecated public void computeBounds(@NonNull android.graphics.RectF, boolean); - method public void computeBounds(@NonNull android.graphics.RectF); + method @FlaggedApi("com.android.graphics.flags.exact_compute_bounds") public void computeBounds(@NonNull android.graphics.RectF); method public void conicTo(float, float, float, float, float); method public void cubicTo(float, float, float, float, float, float); method @NonNull public android.graphics.Path.FillType getFillType(); diff --git a/graphics/java/Android.bp b/graphics/java/Android.bp index 63d1f6d6f2d6..db37a38756d2 100644 --- a/graphics/java/Android.bp +++ b/graphics/java/Android.bp @@ -7,6 +7,12 @@ package { default_applicable_licenses: ["frameworks_base_license"], } +aconfig_declarations { + name: "framework_graphics_flags", + package: "com.android.graphics.flags", + srcs: ["android/framework_graphics.aconfig"], +} + filegroup { name: "framework-graphics-nonupdatable-sources", srcs: [ diff --git a/graphics/java/android/framework_graphics.aconfig b/graphics/java/android/framework_graphics.aconfig new file mode 100644 index 000000000000..e030dad6bf14 --- /dev/null +++ b/graphics/java/android/framework_graphics.aconfig @@ -0,0 +1,8 @@ +package: "com.android.graphics.flags" + +flag { + name: "exact_compute_bounds" + namespace: "framework_graphics" + description: "Add a function without unused exact param for computeBounds." + bug: "304478551" +}
\ No newline at end of file diff --git a/graphics/java/android/graphics/Path.java b/graphics/java/android/graphics/Path.java index c9c1b23d874c..deb89faf3419 100644 --- a/graphics/java/android/graphics/Path.java +++ b/graphics/java/android/graphics/Path.java @@ -16,11 +16,14 @@ package android.graphics; +import android.annotation.FlaggedApi; import android.annotation.FloatRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.Size; +import com.android.graphics.flags.Flags; + import dalvik.annotation.optimization.CriticalNative; import dalvik.annotation.optimization.FastNative; @@ -309,6 +312,7 @@ public class Path { * * @param bounds Returns the computed bounds of the path's control points. */ + @FlaggedApi(Flags.FLAG_EXACT_COMPUTE_BOUNDS) public void computeBounds(@NonNull RectF bounds) { nComputeBounds(mNativePath, bounds); } |