Merge "Removing enable_plugin_manager flag" into main (b77d192c) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/feature/DisplayManagerFlags.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -231,11 +231,6 @@ public class DisplayManagerFlags {
		Flags::enableGetSupportedRefreshRates
		);

		private final FlagState mEnablePluginManagerFlagState = new FlagState(
		Flags.FLAG_ENABLE_PLUGIN_MANAGER,
		Flags::enablePluginManager
		);

		private final FlagState mEnableHdrOverridePluginTypeFlagState = new FlagState(
		Flags.FLAG_ENABLE_HDR_OVERRIDE_PLUGIN_TYPE,
		Flags::enableHdrOverridePluginType
		@@ -572,10 +567,6 @@ public class DisplayManagerFlags {
		return mGetSupportedRefreshRatesFlagState.isEnabled();
		}

		public boolean isPluginManagerEnabled() {
		return mEnablePluginManagerFlagState.isEnabled();
		}

		public boolean isHdrOverrideEnabled() {
		return mEnableHdrOverridePluginTypeFlagState.isEnabled();
		}
		@@ -719,7 +710,6 @@ public class DisplayManagerFlags {
		pw.println(" " + mHasArrSupport);
		pw.println(" " + mAutoBrightnessModeBedtimeWearFlagState);
		pw.println(" " + mGetSupportedRefreshRatesFlagState);
		pw.println(" " + mEnablePluginManagerFlagState);
		pw.println(" " + mDisplayListenerPerformanceImprovementsFlagState);
		pw.println(" " + mSubscribeGranularDisplayEvents);
		pw.println(" " + mEnableDisplayContentModeManagementFlagState);

+0 −8

Original line number	Diff line number	Diff line
		@@ -404,14 +404,6 @@ flag {
		is_exported: true
		}

		flag {
		name: "enable_plugin_manager"
		namespace: "display_manager"
		description: "Flag to enable DisplayManager plugins"
		bug: "354059797"
		is_fixed_read_only: true
		}

		flag {
		name: "enable_hdr_override_plugin_type"
		namespace: "display_manager"

+3 −8

Original line number	Diff line number	Diff line
		@@ -56,14 +56,9 @@ public class PluginManager {
		PluginManager(Context context, DisplayManagerFlags flags, Injector injector) {
		Set<PluginType<?>> enabledTypes = injector.getEnabledPluginTypes(flags);
		mPluginStorage = injector.getPluginStorage(enabledTypes);
		if (flags.isPluginManagerEnabled()) {
		mPlugins = Collections.unmodifiableList(injector.loadPlugins(
		context, mPluginStorage, enabledTypes));
		Slog.d(TAG, "loaded Plugins:" + mPlugins);
		} else {
		mPlugins = List.of();
		Slog.d(TAG, "PluginManager disabled");
		}
		}

		/**

+1 −16

Original line number	Diff line number	Diff line
		@@ -20,13 +20,9 @@ import android.content.Context
		import androidx.test.filters.SmallTest
		import com.android.server.display.feature.DisplayManagerFlags
		import com.android.server.display.plugin.PluginManager.PluginChangeListener

		import org.junit.Test

		import org.mockito.kotlin.mock
		import org.mockito.kotlin.never
		import org.mockito.kotlin.verify
		import org.mockito.kotlin.whenever

		private val TEST_PLUGIN_TYPE = PluginType(Int::class.java, "test_type")
		private val DISPLAY_ID = "display_id"
		@@ -49,16 +45,6 @@ class PluginManagerTest {
		verify(testInjector.mockPlugin2).onBootCompleted()
		}

		@Test
		fun testBootCompleted_disabledPluginManager() {
		val pluginManager = createPluginManager(false)

		pluginManager.onBootCompleted()

		verify(testInjector.mockPlugin1, never()).onBootCompleted()
		verify(testInjector.mockPlugin2, never()).onBootCompleted()
		}

		@Test
		fun testSubscribe() {
		val pluginManager = createPluginManager()
		@@ -77,8 +63,7 @@ class PluginManagerTest {
		verify(testInjector.mockStorage).removeListener(TEST_PLUGIN_TYPE, DISPLAY_ID, mockListener)
		}

		private fun createPluginManager(enabled: Boolean = true): PluginManager {
		whenever(mockFlags.isPluginManagerEnabled).thenReturn(enabled)
		private fun createPluginManager(): PluginManager {
		return PluginManager(mockContext, mockFlags, testInjector)
		}