Merge "guard new Xfermode API usage in Paint" into main (22809a12) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/Paint.java

+13 −9

Original line number	Diff line number	Diff line
		@@ -836,6 +836,7 @@ public class Paint {
		mNativeColorFilter = newNativeColorFilter;
		nSetColorFilter(mNativePaint, mNativeColorFilter);
		}
		if (com.android.graphics.hwui.flags.Flags.runtimeColorFiltersBlenders()) {
		if (mXfermode instanceof RuntimeXfermode) {
		long newNativeXfermode = ((RuntimeXfermode) mXfermode).createNativeInstance();
		if (newNativeXfermode != mNativeXfermode) {
		@@ -843,6 +844,7 @@ public class Paint {
		nSetXfermode(mNativePaint, mNativeXfermode);
		}
		}
		}
		return mNativePaint;
		}

		@@ -1470,11 +1472,13 @@ public class Paint {

		@Nullable
		private Xfermode installXfermode(Xfermode xfermode) {
		if (com.android.graphics.hwui.flags.Flags.runtimeColorFiltersBlenders()) {
		if (xfermode instanceof RuntimeXfermode) {
		mXfermode = xfermode;
		nSetXfermode(mNativePaint, ((RuntimeXfermode) xfermode).createNativeInstance());
		return xfermode;
		}
		}
		int newMode = (xfermode instanceof PorterDuffXfermode)
		? ((PorterDuffXfermode) xfermode).porterDuffMode : PorterDuffXfermode.DEFAULT;
		int curMode = (mXfermode instanceof PorterDuffXfermode)