Merge "Add a flag to a Gainmap constructor." into main (40d768fd) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -15671,7 +15671,7 @@ package android.graphics {

		public final class Gainmap implements android.os.Parcelable {
		ctor public Gainmap(@NonNull android.graphics.Bitmap);
		ctor public Gainmap(@NonNull android.graphics.Gainmap, @NonNull android.graphics.Bitmap);
		ctor @FlaggedApi("com.android.graphics.hwui.flags.gainmap_constructor_with_metadata") public Gainmap(@NonNull android.graphics.Gainmap, @NonNull android.graphics.Bitmap);
		method public int describeContents();
		method @NonNull public float getDisplayRatioForFullHdr();
		method @NonNull public float[] getEpsilonHdr();

+4 −0

Original line number	Diff line number	Diff line
		@@ -16,11 +16,14 @@

		package android.graphics;

		import android.annotation.FlaggedApi;
		import android.annotation.FloatRange;
		import android.annotation.NonNull;
		import android.os.Parcel;
		import android.os.Parcelable;

		import com.android.graphics.hwui.flags.Flags;

		import libcore.util.NativeAllocationRegistry;

		/**
		@@ -125,6 +128,7 @@ public final class Gainmap implements Parcelable {
		* Creates a new gainmap using the provided gainmap as the metadata source and the provided
		* bitmap as the replacement for the gainmapContents
		*/
		@FlaggedApi(Flags.FLAG_GAINMAP_CONSTRUCTOR_WITH_METADATA)
		public Gainmap(@NonNull Gainmap gainmap, @NonNull Bitmap gainmapContents) {
		this(gainmapContents, nCreateCopy(gainmap.mNativePtr));
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -20,3 +20,10 @@ flag {
		description: "APIs to help enable animations involving gainmaps"
		bug: "296482289"
		}

		flag {
		name: "gainmap_constructor_with_metadata"
		namespace: "core_graphics"
		description: "APIs to create a new gainmap with a bitmap for metadata."
		bug: "304478551"
		}