Merge "Don't set timeout when showing CDM UI"

2020-10-05 20:56:48 +00:00
parent 8942ade569 9820b8ffb5
commit 0266683a20
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
@@ -317,7 +317,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 {