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

Commit 7ced2599 authored by Chet Haase's avatar Chet Haase
Browse files

Rename Path.iterator method to avoid AndroidX collision 

There will be an extension function in the AndroidX version
of this API with the name 'iterator'. Callers of that API
should get the extension version instead, but Kotlin defers
to the actual implementation if it exists. Changing the method
name here (and removing the new implementation of the
Iterable interface) to avoid that collision.

Bug: 223586753
Test: Changed PathIterator cts tests to suit

Change-Id: I30e2c227ddc4fd387a90d72c52c1324c9207a3a7
parent e42a0990

apct-tests/perftests/core/src/android/graphics/perftests/PathIteratorPerfTest.java

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class PathIteratorPerfTest { 
        BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        Path path = constructCircularPath(numSegments);

        while (state.keepRunning()) {

            PathIterator iterator = path.iterator();

            PathIterator iterator = path.getPathIterator();

            PathIterator.Segment segment = iterator.next();

            while (segment.getVerb() != VERB_DONE) {

                segment = iterator.next();
@@ -71,7 +71,7 @@ public class PathIteratorPerfTest { 
        float[] points = new float[8];

        Path path = constructCircularPath(numSegments);

        while (state.keepRunning()) {

            PathIterator iterator = path.iterator();

            PathIterator iterator = path.getPathIterator();

            int verb = iterator.next(points, 0);

            while (verb != VERB_DONE) {

                verb = iterator.next(points, 0);

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -15128,7 +15128,7 @@ package android.graphics { 
    field @NonNull public static final android.os.Parcelable.Creator<android.graphics.ParcelableColorSpace> CREATOR;

  }













  public class Path implements java.lang.Iterable<android.graphics.PathIterator.Segment> {













  public class Path {















    ctor public Path();















    ctor public Path(@Nullable android.graphics.Path);















    method public void addArc(@NonNull android.graphics.RectF, float, float);









@@ -15155,6 +15155,7 @@ package android.graphics {













    method public void cubicTo(float, float, float, float, float, float);















    method @NonNull public android.graphics.Path.FillType getFillType();















    method public int getGenerationId();













    method @NonNull public android.graphics.PathIterator getPathIterator();















    method public void incReserve(int);















    method public boolean interpolate(@NonNull android.graphics.Path, float, @NonNull android.graphics.Path);















    method @Deprecated public boolean isConvex();









@@ -15162,7 +15163,6 @@ package android.graphics {













    method public boolean isInterpolatable(@NonNull android.graphics.Path);















    method public boolean isInverseFillType();















    method public boolean isRect(@Nullable android.graphics.RectF);













    method @NonNull public android.graphics.PathIterator iterator();















    method public void lineTo(float, float);















    method public void moveTo(float, float);















    method public void offset(float, float, @Nullable android.graphics.Path);

























graphics/java/android/graphics/Path.java



+2
−3




























Original line number
Diff line number
Diff line








@@ -33,7 +33,7 @@ import libcore.util.NativeAllocationRegistry;













 * (based on the paint's Style), or it can be used for clipping or to draw















 * text on a path.















 */













public class Path implements Iterable<PathIterator.Segment> {













public class Path {































    private static final NativeAllocationRegistry sRegistry =















            NativeAllocationRegistry.createMalloced(










@@ -97,8 +97,7 @@ public class Path implements Iterable<PathIterator.Segment> {













     * @return the Iterator object















     */















    @NonNull













    @Override













    public PathIterator iterator() {













    public PathIterator getPathIterator() {















        return new PathIterator(this);















    }