Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 635d7aeb authored by Eugene Susla's avatar Eugene Susla
Browse files

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 9820b8ff)
parent d3a42550

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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 {