commit cf8cb1d5f675b71b0632f87794fe6fe423c18109
author Chandan Nath <nathch@google.com> Mon Jul 15 10:43:54 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 15 10:43:54 2019 +0000
tree 1ad3f86467a2ae3c198da079aa8ea687d756dd58
parent f53fa7d5e2b7d57cbcb41058b98a4ecf67af2895
parent 3255dac62c0049a52e92ed4004d7954abf845900

Merge "Increase BMS initialization timeout"

common/util/src/com/android/compatibility/common/util/BackupUtils.java

diff --git a/common/util/src/com/android/compatibility/common/util/BackupUtils.java b/common/util/src/com/android/compatibility/common/util/BackupUtils.java
index e55c800..eeb1eb0 100644
--- a/common/util/src/com/android/compatibility/common/util/BackupUtils.java
+++ b/common/util/src/com/android/compatibility/common/util/BackupUtils.java
@@ -43,7 +43,7 @@
 
     private static final int BACKUP_PROVISIONING_TIMEOUT_SECONDS = 30;
     private static final int BACKUP_PROVISIONING_POLL_INTERVAL_SECONDS = 1;
-    private static final int BACKUP_SERVICE_INIT_TIMEOUT_SECS = 30;
+    private static final long BACKUP_SERVICE_INIT_TIMEOUT_SECS = TimeUnit.MINUTES.toSeconds(2);
 
     private static final Pattern BACKUP_MANAGER_CURRENTLY_ENABLE_STATUS_PATTERN =
             Pattern.compile("^Backup Manager currently (enabled|disabled)$");
@@ -371,7 +371,7 @@
     }
 
     @VisibleForTesting
-    void waitUntilBackupServiceIsRunning(int userId, int timeout)
+    void waitUntilBackupServiceIsRunning(int userId, long timeout)
             throws IOException, InterruptedException {
         CommonTestUtils.waitUntil(
                 "Backup Manager init timed out",