Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update graphics language to comply with Android’s inclusive language guidance" am: da4dc882af am: a97e560c61

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

Change-Id: I5d853a84c0fe1550d86d0f948f76e532af42e073
This commit is contained in:
Leon Scroggins
2020-07-23 13:56:41 +00:00
committed by Automerger Merge Worker
parent c2bfd3c51b a97e560c61
commit 53ee2070ed
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/tests/coretests/src/android/graphics/PathTest.java
View File

@@ -28,7 +28,9 @@ public class PathTest extends TestCase {
final Path.FillType defaultFillType = path.getFillType(); final Path.FillType defaultFillType = path.getFillType();
final Path.FillType fillType = Path.FillType.INVERSE_EVEN_ODD; 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.setFillType(fillType);
path.reset(); path.reset();

4
graphics/java/android/graphics/Region.java
View File

@@ -409,10 +409,10 @@ public class Region implements Parcelable {
mNativeRegion = ni; 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 */ triggering 'not cloneable' exception */
@UnsupportedAppUsage @UnsupportedAppUsage
private Region(long ni, int dummy) { private Region(long ni, int unused) {
this(ni); this(ni);
} }

7
libs/hwui/hwui/Bitmap.cpp
View File

@@ -217,11 +217,8 @@ static SkImageInfo validateAlpha(const SkImageInfo& info) {
void Bitmap::reconfigure(const SkImageInfo& newInfo, size_t rowBytes) { void Bitmap::reconfigure(const SkImageInfo& newInfo, size_t rowBytes) {
mInfo = validateAlpha(newInfo); mInfo = validateAlpha(newInfo);
// Dirty hack is dirty // TODO: Skia intends for SkPixelRef to be immutable, but this method
// TODO: Figure something out here, Skia's current design makes this // modifies it. Find another way to support reusing the same pixel memory.
// 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
this->android_only_reset(mInfo.width(), mInfo.height(), rowBytes); this->android_only_reset(mInfo.width(), mInfo.height(), rowBytes);
} }