Merge "Cleanup flag media_description_ashmem_bitmap" into main (b6d0b42e) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+0 −17

Original line number	Diff line number	Diff line
		@@ -100,7 +100,6 @@ aconfig_declarations_group {
		"com.android.media.flags.bettertogether-aconfig-java",
		"com.android.media.flags.editing-aconfig-java",
		"com.android.media.flags.mediasession-aconfig-java",
		"com.android.media.flags.performance-aconfig-java",
		"com.android.media.flags.projection-aconfig-java",
		"com.android.net.http.flags-aconfig-exported-java",
		"com.android.net.thread.platform.flags-aconfig-java",
		@@ -849,22 +848,6 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// Media Performance
		aconfig_declarations {
		name: "com.android.media.flags.performance-aconfig",
		package: "com.android.media.performance.flags",
		container: "system",
		srcs: [
		"media/java/android/media/flags/performance.aconfig",
		],
		}

		java_aconfig_library {
		name: "com.android.media.flags.performance-aconfig-java",
		aconfig_declarations: "com.android.media.flags.performance-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// Media TV
		aconfig_declarations {
		name: "android.media.tv.flags-aconfig",

+1 −3

Original line number	Diff line number	Diff line
		@@ -25,8 +25,6 @@ import android.os.Parcel;
		import android.os.Parcelable;
		import android.text.TextUtils;

		import com.android.media.performance.flags.Flags;

		/**
		* A simple set of metadata for a media item suitable for display. This can be
		* created using the Builder or retrieved from existing metadata using
		@@ -355,7 +353,7 @@ public class MediaDescription implements Parcelable {
		* @return this
		*/
		public Builder setIconBitmap(@Nullable Bitmap icon) {
		mIcon = (icon != null && Flags.mediaDescriptionAshmemBitmap()) ? icon.asShared() : icon;
		mIcon = icon != null ? icon.asShared() : null;
		return this;
		}

deleted100644 → 0

+0 −12

Original line number	Diff line number	Diff line
		package: "com.android.media.performance.flags"
		container: "system"

		flag {
		name: "media_description_ashmem_bitmap"
		namespace: "systemui"
		description: "Use ashmem to pass bitmaps in MediaDescription to avoid excessive Bitmap copies."
		bug: "288241280"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}