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

Commit f9fbdb69 authored by Eugene Susla's avatar Eugene Susla Committed by Android (Google) Code Review
Browse files

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

parents 94fc18f3 635d7aeb

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 {