Merge "Cleanup condense_configuration_change_for_simple_mode flag." into main (2b10d206) · Commits · e / os / android_frameworks_base

core/java/android/window/ConfigurationChangeSetting.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import android.view.IWindowManager;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.server.LocalServices;
		import com.android.window.flags.Flags;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		@@ -61,12 +60,6 @@ public abstract class ConfigurationChangeSetting implements Parcelable {
		private final int mSettingType;

		private ConfigurationChangeSetting(@SettingType int settingType) {
		if (!Flags.condenseConfigurationChangeForSimpleMode()) {
		throw new IllegalStateException(
		"ConfigurationChangeSetting cannot be instantiated because the "
		+ "condenseConfigurationChangeForSimpleMode flag is not enabled. "
		+ "Please ensure this flag is enabled.");
		}
		mSettingType = settingType;
		}

core/java/android/window/flags/windowing_sdk.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -107,16 +107,6 @@ flag {
		}
		}

		flag {
		namespace: "windowing_sdk"
		name: "condense_configuration_change_for_simple_mode"
		description: "Condense configuration change for simple mode"
		bug: "356738240"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		namespace: "car_framework"
		name: "safe_region_letterboxing"

core/tests/coretests/src/android/window/ConfigurationChangeSettingTest.kt

+0 −18

Original line number	Diff line number	Diff line
		@@ -18,10 +18,7 @@ package android.window

		import android.os.Parcel
		import android.os.Parcelable
		import android.platform.test.annotations.DisableFlags
		import android.platform.test.annotations.EnableFlags
		import android.platform.test.annotations.Presubmit
		import android.platform.test.flag.junit.SetFlagsRule
		import android.view.Display.DEFAULT_DISPLAY
		import android.window.ConfigurationChangeSetting.SETTING_TYPE_UNKNOWN
		import android.window.ConfigurationChangeSetting.SETTING_TYPE_DISPLAY_DENSITY
		@@ -30,12 +27,10 @@ import android.window.ConfigurationChangeSetting.ConfigurationChangeSettingInter
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.server.LocalServices
		import com.android.window.flags.Flags
		import com.google.common.truth.Truth.assertThat
		import kotlin.test.AfterTest
		import kotlin.test.BeforeTest
		import org.junit.Assert.assertThrows
		import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.kotlin.any
		@@ -54,9 +49,6 @@ import org.mockito.kotlin.verify
		@Presubmit
		@RunWith(AndroidJUnit4::class)
		class ConfigurationChangeSettingTest {
		@get:Rule
		val setFlagsRule: SetFlagsRule = SetFlagsRule()

		private val mMockConfigurationChangeSettingInternal = mock<ConfigurationChangeSettingInternal>()

		@BeforeTest
		@@ -73,12 +65,6 @@ class ConfigurationChangeSettingTest {
		tearDownLocalService()
		}

		@Test(expected = IllegalStateException::class)
		@DisableFlags(Flags.FLAG_CONDENSE_CONFIGURATION_CHANGE_FOR_SIMPLE_MODE)
		fun settingCreation_whenFlagDisabled_throwsException() {
		ConfigurationChangeSetting.DensitySetting(DEFAULT_DISPLAY, TEST_DENSITY)
		}

		@Test
		fun invalidSettingType_appClient_throwsException() {
		val parcel = Parcel.obtain()
		@@ -95,7 +81,6 @@ class ConfigurationChangeSettingTest {
		}

		@Test
		@EnableFlags(Flags.FLAG_CONDENSE_CONFIGURATION_CHANGE_FOR_SIMPLE_MODE)
		fun densitySettingParcelable_appClient_recreatesSucceeds() {
		val setting = ConfigurationChangeSetting.DensitySetting(DEFAULT_DISPLAY, TEST_DENSITY)

		@@ -106,7 +91,6 @@ class ConfigurationChangeSettingTest {
		}

		@Test
		@EnableFlags(Flags.FLAG_CONDENSE_CONFIGURATION_CHANGE_FOR_SIMPLE_MODE)
		fun densitySettingParcelable_systemServer_createsImplFromInternal() {
		val setting = ConfigurationChangeSetting.DensitySetting(DEFAULT_DISPLAY, TEST_DENSITY)
		val mockDensitySetting = mock<ConfigurationChangeSetting.DensitySetting>()
		@@ -124,7 +108,6 @@ class ConfigurationChangeSettingTest {
		}

		@Test
		@EnableFlags(Flags.FLAG_CONDENSE_CONFIGURATION_CHANGE_FOR_SIMPLE_MODE)
		fun fontScaleSettingParcelable_appClient_recreatesSucceeds() {
		val setting = ConfigurationChangeSetting.FontScaleSetting(TEST_FONT_SCALE)

		@@ -135,7 +118,6 @@ class ConfigurationChangeSettingTest {
		}

		@Test
		@EnableFlags(Flags.FLAG_CONDENSE_CONFIGURATION_CHANGE_FOR_SIMPLE_MODE)
		fun fontScaleSettingParcelable_systemServer_createsImplFromInternal() {
		val setting = ConfigurationChangeSetting.FontScaleSetting(TEST_FONT_SCALE)
		val mockFontScaleSetting = mock<ConfigurationChangeSetting.FontScaleSetting>()

services/core/java/com/android/server/wm/WindowManagerService.java

+3 −11

Original line number	Diff line number	Diff line
		@@ -1461,12 +1461,10 @@ public class WindowManagerService extends IWindowManager.Stub
		}, mTransactionFactory);
		mSystemPerformanceHinter.mTraceTag = TRACE_TAG_WINDOW_MANAGER;

		if (Flags.condenseConfigurationChangeForSimpleMode()) {
		LocalServices.addService(
		ConfigurationChangeSetting.ConfigurationChangeSettingInternal.class,
		new ConfigurationChangeSettingInternalImpl());
		}
		}

		DisplayAreaPolicy.Provider getDisplayAreaPolicyProvider() {
		return mDisplayAreaPolicyProvider;
		@@ -6346,12 +6344,6 @@ public class WindowManagerService extends IWindowManager.Stub
		public void setConfigurationChangeSettingsForUser(
		@NonNull List<ConfigurationChangeSetting> settings, int userId) {
		setConfigurationChangeSettingsForUser_enforcePermission();
		if (!Flags.condenseConfigurationChangeForSimpleMode()) {
		throw new IllegalStateException(
		"setConfigurationChangeSettingsForUser shouldn't be called when "
		+ "condenseConfigurationChangeForSimpleMode is disabled, "
		+ "please enable the flag.");
		}

		final int callingUserId = ActivityManager.handleIncomingUser(Binder.getCallingPid(),
		Binder.getCallingUid(), userId, false, true,

services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTestSupport.kt

+3 −7

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import com.android.server.DisplayThread
		import com.android.server.LocalServices
		import com.android.server.input.InputManagerService
		import com.android.server.policy.WindowManagerPolicy
		import com.android.window.flags.Flags

		/**
		* Provides support for tests that require a [WindowManagerService].
		@@ -102,11 +101,8 @@ object WindowManagerServiceTestSupport {
		LocalServices.removeServiceForTest(WindowManagerPolicy::class.java)
		LocalServices.removeServiceForTest(WindowManagerInternal::class.java)
		LocalServices.removeServiceForTest(ImeTargetVisibilityPolicy::class.java)

		if (Flags.condenseConfigurationChangeForSimpleMode()) {
		LocalServices.removeServiceForTest(
		ConfigurationChangeSetting.ConfigurationChangeSettingInternal::class.java,
		ConfigurationChangeSetting.ConfigurationChangeSettingInternal::class.java
		)
		}
		}
		}