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

Commit 0c0fc663 authored by Adam Bookatz's avatar Adam Bookatz Committed by Android (Google) Code Review
Browse files

Merge "Increase user-unlock timeout for ___UserContentResolverTest" into tm-dev

parents 1442d344 f3b06528
Loading
Loading
Loading
Loading
+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;