Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2200486 authored by Adam Bookatz's avatar Adam Bookatz Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I783e5f4fa8837ec7fa356e643044539ee83776fb
parents f8d183fb 0c0fc663

core/tests/coretests/src/android/content/AbstractCrossUserContentResolverTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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;