Don't set timeout when showing CDM UI

Since it's a UI-based operation, there's no need to set a timeout.

Bug: 167592848
Test: manual; atest CompanionDeviceManagerTest
Change-Id: I3c399858064eefc1eaa867201551f1652198cb06
(cherry picked from commit 9820b8ffb5)
This commit is contained in:
Eugene Susla
2020-10-05 12:21:33 -07:00
parent d3a425504e
commit 635d7aebcd

View File

@@ -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 {