From e0b8a315dd6a4efae7334458a61a2a1dd32fde61 Mon Sep 17 00:00:00 2001
From: Carlos Martinez Romero <carlosmr@google.com>
Date: Wed, 11 Oct 2023 17:52:00 +0000
Subject: Add a flag to a previous API change.

This was changed recently b/216813597 and at that point it should have
been behind a flag.

Bug: 304478551
Test: it builds fine?
Change-Id: I21912cc463632ec867b50c7100b6a50222d9f771
---
 AconfigFlags.bp                                  | 9 ++++++++-
 core/api/current.txt                             | 2 +-
 graphics/java/Android.bp                         | 6 ++++++
 graphics/java/android/framework_graphics.aconfig | 8 ++++++++
 graphics/java/android/graphics/Path.java         | 4 ++++
 5 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 graphics/java/android/framework_graphics.aconfig

diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 003b7f87fa23..da86a2630e62 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -36,6 +36,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}",
     ":android.multiuser.flags-aconfig-java{.generated_srcjars}",
     ":android.app.flags-aconfig-java{.generated_srcjars}",
@@ -333,6 +334,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",
@@ -424,7 +431,7 @@ aconfig_declarations {
     package: "android.service.autofill",
     srcs: [
         "services/autofill/bugfixes.aconfig",
-        "services/autofill/features.aconfig"
+        "services/autofill/features.aconfig",
     ],
 }
 
diff --git a/core/api/current.txt b/core/api/current.txt
index d037c31e5af7..a0aa09dcec55 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -16303,7 +16303,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);
     }
-- 
cgit v1.2.3-59-g8ed1b