Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Device Config] Ensure every config has a default setting." into tm-dev am: 81d47257ba

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18619288

Change-Id: I060584d84d58f134d55a19b571fa33f2843a54fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-27 22:34:38 +00:00
committed by Automerger Merge Worker
parent 84f256e3a8 81d47257ba
commit bf585f48b6
1 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java
View File

@@ -108,6 +108,13 @@ import org.junit.runner.RunWith;
@Presubmit @Presubmit
@RunWith(WindowTestRunner.class) @RunWith(WindowTestRunner.class)
public class SizeCompatTests extends WindowTestsBase { public class SizeCompatTests extends WindowTestsBase {
private static final String CONFIG_NEVER_CONSTRAIN_DISPLAY_APIS =
"never_constrain_display_apis";
private static final String CONFIG_ALWAYS_CONSTRAIN_DISPLAY_APIS =
"always_constrain_display_apis";
private static final String CONFIG_NEVER_CONSTRAIN_DISPLAY_APIS_ALL_PACKAGES =
"never_constrain_display_apis_all_packages";
@Rule @Rule
public TestRule compatChangeRule = new PlatformCompatChangeRule(); public TestRule compatChangeRule = new PlatformCompatChangeRule();
@@ -123,8 +130,10 @@ public class SizeCompatTests extends WindowTestsBase {
doReturn(mActivityMetricsLogger).when(mAtm.mTaskSupervisor).getActivityMetricsLogger(); doReturn(mActivityMetricsLogger).when(mAtm.mTaskSupervisor).getActivityMetricsLogger();
mInitialConstrainDisplayApisFlags = DeviceConfig.getProperties( mInitialConstrainDisplayApisFlags = DeviceConfig.getProperties(
NAMESPACE_CONSTRAIN_DISPLAY_APIS); NAMESPACE_CONSTRAIN_DISPLAY_APIS);
DeviceConfig.setProperties( // Provide empty default values for the configs.
new Properties.Builder(NAMESPACE_CONSTRAIN_DISPLAY_APIS).build()); setNeverConstrainDisplayApisFlag("", true);
setNeverConstrainDisplayApisAllPackagesFlag(false, true);
setAlwaysConstrainDisplayApisFlag("", true);
} }
@After @After
@@ -805,9 +814,9 @@ public class SizeCompatTests extends WindowTestsBase {
public void testNeverConstrainDisplayApisDeviceConfig_allPackagesFlagTrue_sandboxNotApplied() { public void testNeverConstrainDisplayApisDeviceConfig_allPackagesFlagTrue_sandboxNotApplied() {
setUpDisplaySizeWithApp(1000, 1200); setUpDisplaySizeWithApp(1000, 1200);
setNeverConstrainDisplayApisAllPackagesFlag("true"); setNeverConstrainDisplayApisAllPackagesFlag(true, false);
// Setting 'never_constrain_display_apis' as well to make sure it is ignored. // Setting 'never_constrain_display_apis' as well to make sure it is ignored.
setNeverConstrainDisplayApisFlag("com.android.other::,com.android.other2::"); setNeverConstrainDisplayApisFlag("com.android.other::,com.android.other2::", false);
// Make the task root resizable. // Make the task root resizable.
mActivity.info.resizeMode = RESIZE_MODE_RESIZEABLE; mActivity.info.resizeMode = RESIZE_MODE_RESIZEABLE;
@@ -830,7 +839,7 @@ public class SizeCompatTests extends WindowTestsBase {
setNeverConstrainDisplayApisFlag( setNeverConstrainDisplayApisFlag(
"com.android.frameworks.wmtests:20:,com.android.other::," "com.android.frameworks.wmtests:20:,com.android.other::,"
+ "com.android.frameworks.wmtests:0:10"); + "com.android.frameworks.wmtests:0:10", false);
// Make the task root resizable. // Make the task root resizable.
mActivity.info.resizeMode = RESIZE_MODE_RESIZEABLE; mActivity.info.resizeMode = RESIZE_MODE_RESIZEABLE;
@@ -851,7 +860,8 @@ public class SizeCompatTests extends WindowTestsBase {
public void testNeverConstrainDisplayApisDeviceConfig_packageOutsideRange_sandboxingApplied() { public void testNeverConstrainDisplayApisDeviceConfig_packageOutsideRange_sandboxingApplied() {
setUpDisplaySizeWithApp(1000, 1200); setUpDisplaySizeWithApp(1000, 1200);
setNeverConstrainDisplayApisFlag("com.android.other::,com.android.frameworks.wmtests:1:5"); setNeverConstrainDisplayApisFlag("com.android.other::,com.android.frameworks.wmtests:1:5",
false);
// Make the task root resizable. // Make the task root resizable.
mActivity.info.resizeMode = RESIZE_MODE_RESIZEABLE; mActivity.info.resizeMode = RESIZE_MODE_RESIZEABLE;
@@ -870,7 +880,7 @@ public class SizeCompatTests extends WindowTestsBase {
public void testNeverConstrainDisplayApisDeviceConfig_packageNotInFlag_sandboxingApplied() { public void testNeverConstrainDisplayApisDeviceConfig_packageNotInFlag_sandboxingApplied() {
setUpDisplaySizeWithApp(1000, 1200); setUpDisplaySizeWithApp(1000, 1200);
setNeverConstrainDisplayApisFlag("com.android.other::,com.android.other2::"); setNeverConstrainDisplayApisFlag("com.android.other::,com.android.other2::", false);
// Make the task root resizable. // Make the task root resizable.
mActivity.info.resizeMode = RESIZE_MODE_RESIZEABLE; mActivity.info.resizeMode = RESIZE_MODE_RESIZEABLE;
@@ -952,7 +962,7 @@ public class SizeCompatTests extends WindowTestsBase {
setAlwaysConstrainDisplayApisFlag( setAlwaysConstrainDisplayApisFlag(
"com.android.frameworks.wmtests:20:,com.android.other::," "com.android.frameworks.wmtests:20:,com.android.other::,"
+ "com.android.frameworks.wmtests:0:10"); + "com.android.frameworks.wmtests:0:10", false);
// Make the task root resizable. // Make the task root resizable.
mActivity.info.resizeMode = RESIZE_MODE_RESIZEABLE; mActivity.info.resizeMode = RESIZE_MODE_RESIZEABLE;
@@ -2562,19 +2572,22 @@ public class SizeCompatTests extends WindowTestsBase {
displayContent.onRequestedOverrideConfigurationChanged(c); displayContent.onRequestedOverrideConfigurationChanged(c);
} }
private static void setNeverConstrainDisplayApisFlag(@Nullable String value) { private static void setNeverConstrainDisplayApisFlag(@Nullable String value,
DeviceConfig.setProperty(NAMESPACE_CONSTRAIN_DISPLAY_APIS, "never_constrain_display_apis", boolean makeDefault) {
value, /* makeDefault= */ false);
}
private static void setNeverConstrainDisplayApisAllPackagesFlag(@Nullable String value) {
DeviceConfig.setProperty(NAMESPACE_CONSTRAIN_DISPLAY_APIS, DeviceConfig.setProperty(NAMESPACE_CONSTRAIN_DISPLAY_APIS,
"never_constrain_display_apis_all_packages", CONFIG_NEVER_CONSTRAIN_DISPLAY_APIS, value, makeDefault);
value, /* makeDefault= */ false);
} }
private static void setAlwaysConstrainDisplayApisFlag(@Nullable String value) { private static void setNeverConstrainDisplayApisAllPackagesFlag(boolean value,
DeviceConfig.setProperty(NAMESPACE_CONSTRAIN_DISPLAY_APIS, "always_constrain_display_apis", boolean makeDefault) {
value, /* makeDefault= */ false); DeviceConfig.setProperty(NAMESPACE_CONSTRAIN_DISPLAY_APIS,
CONFIG_NEVER_CONSTRAIN_DISPLAY_APIS_ALL_PACKAGES, String.valueOf(value),
makeDefault);
}
private static void setAlwaysConstrainDisplayApisFlag(@Nullable String value,
boolean makeDefault) {
DeviceConfig.setProperty(NAMESPACE_CONSTRAIN_DISPLAY_APIS,
CONFIG_ALWAYS_CONSTRAIN_DISPLAY_APIS, value, makeDefault);
} }
} }