diff options
| author | 2023-11-09 13:35:58 +0000 | |
|---|---|---|
| committer | 2023-11-09 13:35:58 +0000 | |
| commit | ebc49c90b73b47f7099fc6d50a11f807a0cceb63 (patch) | |
| tree | 5774baff779187ef35cff3b1a52624cff8a22e3d | |
| parent | a433eaad9d16e84d31a1b4efa23d37752f529eb7 (diff) | |
| parent | e1ec6c059d30e23d0cd7b74d06c088e367d54a27 (diff) | |
Merge "Fix broken test by increasing Thread#join timeout" into main am: f6020de547 am: e1ec6c059d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2822950
Change-Id: I947eeb1de7d77fe885dd75f4384aa01c43900ed6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/tests/mockingservicestests/src/com/android/server/backup/UserBackupManagerServiceTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/tests/mockingservicestests/src/com/android/server/backup/UserBackupManagerServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/backup/UserBackupManagerServiceTest.java index c942cf4b8ee4..0f7446ba0a6f 100644 --- a/services/tests/mockingservicestests/src/com/android/server/backup/UserBackupManagerServiceTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/backup/UserBackupManagerServiceTest.java @@ -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; |