Merge "Don't set timeout when showing CDM UI" into rvc-qpr-dev

2020-11-10 01:59:54 +00:00
parent 94fc18f36c 635d7aebcd
commit f9fbdb6905
1 changed files with 1 additions and 1 deletions
--- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
@@ -308,7 +308,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
                    AndroidFuture<Association> future = new AndroidFuture<>();
                    service.startDiscovery(request, callingPackage, callback, future);
                    return future;
-                }).whenComplete(uncheckExceptions((association, err) -> {
+                }).cancelTimeout().whenComplete(uncheckExceptions((association, err) -> {
                    if (err == null) {
                        addAssociation(association);
                    } else {