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

Commit c6c49d9b authored by Leon Scroggins's avatar Leon Scroggins Committed by Automerger Merge Worker
Browse files

Merge "Update graphics language to comply with Android’s inclusive language... 

Merge "Update graphics language to comply with Android’s inclusive language guidance" am: da4dc882 am: a97e560c am: 53ee2070 am: fada7aca

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370379

Change-Id: I6de3274146e8ef2324b06658bac9484cd347f0b2
parents 974eefa7 fada7aca

core/tests/coretests/src/android/graphics/PathTest.java

+3 −1
Original line number Diff line number Diff line
@@ -28,7 +28,9 @@ public class PathTest extends TestCase { 


        final Path.FillType defaultFillType = path.getFillType();

        final Path.FillType fillType = Path.FillType.INVERSE_EVEN_ODD;

        assertFalse(fillType.equals(defaultFillType));  // Sanity check for the test itself.



        // This test is only meaningful if it changes from the default.

        assertFalse(fillType.equals(defaultFillType));



        path.setFillType(fillType);

        path.reset();

graphics/java/android/graphics/Region.java

+2 −2
Original line number Diff line number Diff line
@@ -409,10 +409,10 @@ public class Region implements Parcelable { 
        mNativeRegion = ni;

    }



    /* add dummy parameter so constructor can be called from jni without

    /* Add an unused parameter so constructor can be called from jni without

       triggering 'not cloneable' exception */

    @UnsupportedAppUsage

    private Region(long ni, int dummy) {

    private Region(long ni, int unused) {

        this(ni);

    }

libs/hwui/hwui/Bitmap.cpp

+2 −5
Original line number Diff line number Diff line
@@ -217,11 +217,8 @@ static SkImageInfo validateAlpha(const SkImageInfo& info) { 
void Bitmap::reconfigure(const SkImageInfo& newInfo, size_t rowBytes) {

    mInfo = validateAlpha(newInfo);



    // Dirty hack is dirty

    // TODO: Figure something out here, Skia's current design makes this

    // really hard to work with. Skia really, really wants immutable objects,

    // but with the nested-ref-count hackery going on that's just not

    // feasible without going insane trying to figure it out

    // TODO: Skia intends for SkPixelRef to be immutable, but this method

    // modifies it. Find another way to support reusing the same pixel memory.

    this->android_only_reset(mInfo.width(), mInfo.height(), rowBytes);

}