Merge "Increase user-unlock timeout for ___UserContentResolverTest" into tm-dev am: 0c0fc66390

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

Change-Id: I783e5f4fa8837ec7fa356e643044539ee83776fb
This commit is contained in:
Adam Bookatz
2022-03-03 18:29:09 +00:00
committed by Automerger Merge Worker

View File

@@ -49,7 +49,7 @@ import java.util.concurrent.TimeUnit;
abstract class AbstractCrossUserContentResolverTest {
private static final int TIMEOUT_SERVICE_CONNECTION_SEC = 4;
private static final int TIMEOUT_CONTENT_CHANGE_SEC = 4;
private static final int TIMEOUT_USER_UNLOCK_SEC = 4;
private static final int TIMEOUT_USER_UNLOCK_SEC = 10;
private Context mContext;
protected UserManager mUm;