diff options
| author | 2024-12-02 18:42:22 +0000 | |
|---|---|---|
| committer | 2024-12-02 18:42:22 +0000 | |
| commit | f54003ae01986bb7d83f8fad75ba85f4964bfaf2 (patch) | |
| tree | 946d896d47af9e3c42e707f8bd4b7ffae3cb03ce | |
| parent | 16a91e433a230538ee1f5d941d744d8006e51eda (diff) | |
| parent | 43d9d366fb342bbd03883dbbf058d00ed1288a8f (diff) | |
Merge "Remove @Deprecated from Path.computeBounds(RectF, boolean)" into main am: 43d9d366fb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3376212
Change-Id: I5f6efec7e2bd775d6530752081a9323df95a19dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | graphics/java/android/graphics/Path.java | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 8ed47a2d4f24..e0c409abe2c1 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -16803,7 +16803,7 @@ package android.graphics { method public void arcTo(@NonNull android.graphics.RectF, float, float); 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, boolean); 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); diff --git a/graphics/java/android/graphics/Path.java b/graphics/java/android/graphics/Path.java index 073307c7a2e8..d010c525e099 100644 --- a/graphics/java/android/graphics/Path.java +++ b/graphics/java/android/graphics/Path.java @@ -301,10 +301,7 @@ public class Path { * * @param bounds Returns the computed bounds of the path's control points. * @param exact This parameter is no longer used. - * - * @deprecated use computeBounds(RectF) instead */ - @Deprecated @SuppressWarnings({"UnusedDeclaration"}) public void computeBounds(@NonNull RectF bounds, boolean exact) { computeBounds(bounds); |