Merge "Revert "Allow overriding dev option with adb"" into main (ccfcb379) · Commits · e / os / android_frameworks_base

core/java/android/window/DesktopExperienceFlags.java

+10 −35

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package android.window;

		import static com.android.server.display.feature.flags.Flags.FLAG_ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT;
		import static com.android.server.display.feature.flags.Flags.enableDisplayContentModeManagement;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -147,45 +146,31 @@ public enum DesktopExperienceFlags {
		public static class DesktopExperienceFlag {
		// Function called to obtain aconfig flag value.
		private final BooleanSupplier mFlagFunction;
		// Name of the flag, used for adb commands.
		private final String mFlagName;
		// Whether the flag state should be affected by developer option.
		private final boolean mShouldOverrideByDevOption;
		// Cached value for that flag: null if not read yet.
		private Boolean mCachedValue;

		public DesktopExperienceFlag(BooleanSupplier flagFunction,
		boolean shouldOverrideByDevOption,
		@Nullable String flagName) {
		this.mFlagFunction = flagFunction;
		this.mFlagName = flagName;
		this.mShouldOverrideByDevOption = shouldOverrideByDevOption;
		this.mShouldOverrideByDevOption = checkIfFlagShouldBeOverridden(flagName,
		shouldOverrideByDevOption);
		}

		/**
		* Determines state of flag based on the actual flag and desktop experience developer option
		* overrides.
		*
		* The assumption is that the flag's value doesn't change at runtime, or if it changes the
		* user will reboot very soon so being inconsistent across threads is ok.
		*/
		public boolean isTrue() {
		if (mCachedValue == null) {
		mCachedValue = isFlagTrue(mFlagFunction, mShouldOverrideByDevOption, mFlagName);
		}
		return mCachedValue;
		return isFlagTrue(mFlagFunction, mShouldOverrideByDevOption);
		}
		}

		private static final String TAG = "DesktopExperienceFlags";
		// Function called to obtain aconfig flag value.
		private final BooleanSupplier mFlagFunction;
		// Name of the flag, used for adb commands.
		private final String mFlagName;
		// Whether the flag state should be affected by developer option.
		private final boolean mShouldOverrideByDevOption;
		// Cached value for that flag: null if not read yet.
		private Boolean mCachedValue;

		// Local cache for toggle override, which is initialized once on its first access. It needs to
		// be refreshed only on reboots as overridden state is expected to take effect on reboots.
		@@ -199,28 +184,22 @@ public enum DesktopExperienceFlags {
		DesktopExperienceFlags(BooleanSupplier flagFunction, boolean shouldOverrideByDevOption,
		@NonNull String flagName) {
		this.mFlagFunction = flagFunction;
		this.mFlagName = flagName;
		this.mShouldOverrideByDevOption = shouldOverrideByDevOption;
		this.mShouldOverrideByDevOption = checkIfFlagShouldBeOverridden(flagName,
		shouldOverrideByDevOption);
		}

		/**
		* Determines state of flag based on the actual flag and desktop experience developer option
		* overrides.
		*
		* The assumption is that the flag's value doesn't change at runtime, or if it changes the
		* user will reboot very soon so being inconsistent across threads is ok.
		*/
		public boolean isTrue() {
		if (mCachedValue == null) {
		mCachedValue = isFlagTrue(mFlagFunction, mShouldOverrideByDevOption, mFlagName);
		}
		return mCachedValue;
		return isFlagTrue(mFlagFunction, mShouldOverrideByDevOption);
		}

		private static boolean isFlagTrue(
		BooleanSupplier flagFunction, boolean shouldOverrideByDevOption, String flagName) {
		if (Flags.showDesktopExperienceDevOption()
		&& checkIfFlagShouldBeOverridden(flagName, shouldOverrideByDevOption)
		BooleanSupplier flagFunction, boolean shouldOverrideByDevOption) {
		if (shouldOverrideByDevOption
		&& Flags.showDesktopExperienceDevOption()
		&& getToggleOverride()) {
		return true;
		}
		@@ -229,11 +208,7 @@ public enum DesktopExperienceFlags {

		private static boolean checkIfFlagShouldBeOverridden(@Nullable String flagName,
		boolean defaultValue) {
		if (flagName == null \|\| flagName.isEmpty()) return defaultValue;
		int lastDot = flagName.lastIndexOf('.');
		String baseName = lastDot >= 0 ? flagName.substring(lastDot + 1) : flagName;
		return SystemProperties.getBoolean(SYSTEM_PROPERTY_OVERRIDE_PREFIX + baseName,
		defaultValue);
		return defaultValue;
		}

		private static boolean getToggleOverride() {

core/tests/coretests/src/android/window/DesktopExperienceFlagsTest.java

+0 −84

Original line number	Diff line number	Diff line
		@@ -142,90 +142,6 @@ public class DesktopExperienceFlagsTest {
		assertThat(mNotOverriddenLocalFlag.isTrue()).isFalse();
		}

		@Test
		public void isTrue_flagHasDotAndNotOverridden_withSysPropOverride_returnAsDevOptionEnabled()
		throws Exception {
		DesktopExperienceFlag flag = new DesktopExperienceFlag(() -> false, false,
		"test.flag.baseName");
		setSysProp(DesktopExperienceFlags.SYSTEM_PROPERTY_NAME, OVERRIDE_ON_SETTING);
		setSysProp(DesktopExperienceFlags.SYSTEM_PROPERTY_OVERRIDE_PREFIX + "baseName", "true");

		if (Flags.showDesktopExperienceDevOption()) {
		assertThat(flag.isTrue()).isTrue();
		} else {
		assertThat(flag.isTrue()).isFalse();
		}
		}

		@Test
		public void isTrue_flagHasNoDotAndNotOverridden_withSysPropOverride_returnAsDevOptionEnabled()
		throws Exception {
		setSysProp(DesktopExperienceFlags.SYSTEM_PROPERTY_NAME, OVERRIDE_ON_SETTING);
		setSysProp(DesktopExperienceFlags.SYSTEM_PROPERTY_OVERRIDE_PREFIX + "fullName", "true");
		DesktopExperienceFlag flag = new DesktopExperienceFlag(() -> false, false, "fullName");

		if (Flags.showDesktopExperienceDevOption()) {
		assertThat(flag.isTrue()).isTrue();
		} else {
		assertThat(flag.isTrue()).isFalse();
		}
		}

		@Test
		public void isTrue_flagHasNoNameAndNotOverridden_withSysPropOverride_returnAsDevOptionEnabled()
		throws Exception {
		setSysProp(DesktopExperienceFlags.SYSTEM_PROPERTY_NAME, OVERRIDE_ON_SETTING);
		setSysProp(DesktopExperienceFlags.SYSTEM_PROPERTY_OVERRIDE_PREFIX, "true");
		DesktopExperienceFlag flag = new DesktopExperienceFlag(() -> false, false, "");

		assertThat(flag.isTrue()).isFalse();
		}

		@Test
		public void isTrue_flagHasDot_devOptionEnabled_flagOverridden_withSysPropOverride_returnFalse()
		throws Exception {
		setSysProp(DesktopExperienceFlags.SYSTEM_PROPERTY_NAME, OVERRIDE_ON_SETTING);
		setSysProp(DesktopExperienceFlags.SYSTEM_PROPERTY_OVERRIDE_PREFIX + "baseName", "false");
		DesktopExperienceFlag flag = new DesktopExperienceFlag(() -> false, true,
		"test.flag.baseName");

		assertThat(flag.isTrue()).isFalse();
		}

		@Test
		public void isTrue_flagHasNoDot_devOptionEnabled_flagOverridden_withOverride_returnFalse()
		throws Exception {
		setSysProp(DesktopExperienceFlags.SYSTEM_PROPERTY_NAME, OVERRIDE_ON_SETTING);
		setSysProp(DesktopExperienceFlags.SYSTEM_PROPERTY_OVERRIDE_PREFIX + "fullName", "false");
		DesktopExperienceFlag flag = new DesktopExperienceFlag(() -> false, true, "fullName");

		assertThat(flag.isTrue()).isFalse();
		}

		@Test
		public void isTrue_flagHasNoName_devOptionEnabled_flagOverridden_withOverride()
		throws Exception {
		setSysProp(DesktopExperienceFlags.SYSTEM_PROPERTY_NAME, OVERRIDE_ON_SETTING);
		setSysProp(DesktopExperienceFlags.SYSTEM_PROPERTY_OVERRIDE_PREFIX, "false");
		DesktopExperienceFlag flag = new DesktopExperienceFlag(() -> false, true, "");

		if (Flags.showDesktopExperienceDevOption()) {
		assertThat(flag.isTrue()).isTrue();
		} else {
		assertThat(flag.isTrue()).isFalse();
		}
		}

		@Test
		public void isTrue_sysPropSetAfterFirstRead_doesntChangeValue() throws Exception {
		setSysProp(DesktopExperienceFlags.SYSTEM_PROPERTY_NAME, OVERRIDE_ON_SETTING);
		DesktopExperienceFlag flag = new DesktopExperienceFlag(() -> false, false, "fullName");
		flag.isTrue();
		setSysProp(DesktopExperienceFlags.SYSTEM_PROPERTY_OVERRIDE_PREFIX + "fullName", "true");

		assertThat(flag.isTrue()).isFalse();
		}

		private void setSysProp(String name, String value) throws Exception {
		if (!mInitialSyspropValues.containsKey(name)) {
		String initialValue = mUiDevice.executeShellCommand("getprop " + name).trim();