Merge "Decrease UserLifecycleTests.mUserSwitchTimeoutMs to 10 seconds." into main (f400f31e) · Commits · e / os / android_frameworks_base

apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -155,7 +155,7 @@ public class UserLifecycleTests {
	+ " rather than the system user");		+ " rather than the system user");
	}		}
	mUserSwitchTimeoutMs = setSystemProperty(		mUserSwitchTimeoutMs = setSystemProperty(
	"debug.usercontroller.user_switch_timeout_ms", "100000");		"debug.usercontroller.user_switch_timeout_ms", "" + (1000 * TIMEOUT_IN_SECOND / 3));
	mDisableUserSwitchingDialogAnimations = setSystemProperty(		mDisableUserSwitchingDialogAnimations = setSystemProperty(
	"debug.usercontroller.disable_user_switching_dialog_animations", "true");		"debug.usercontroller.disable_user_switching_dialog_animations", "true");
	}		}