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

Commit 0266683a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 8942ade5 9820b8ff

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

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