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

Commit ebc49c90 authored by Sarp Misoglu's avatar Sarp Misoglu Committed by Automerger Merge Worker
Browse files

Merge "Fix broken test by increasing Thread#join timeout" into main am: f6020de5 am: e1ec6c05 

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



Change-Id: I947eeb1de7d77fe885dd75f4384aa01c43900ed6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a433eaad e1ec6c05

services/tests/mockingservicestests/src/com/android/server/backup/UserBackupManagerServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public class UserBackupManagerServiceTest { 
    private static final String TEST_PACKAGE = "package1";

    private static final String[] TEST_PACKAGES = new String[] { TEST_PACKAGE };

    private static final String TEST_TRANSPORT = "transport";

    private static final int WORKER_THREAD_TIMEOUT_MILLISECONDS = 1;

    private static final int WORKER_THREAD_TIMEOUT_MILLISECONDS = 100;



    @Mock Context mContext;

    @Mock IBackupManagerMonitor mBackupManagerMonitor;