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

Commit e618d32b authored by Eugene Susla's avatar Eugene Susla Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13000085

Change-Id: Ic22f6186f11e61ad5dc545735847332dc47a8055
parents 5fa9d66f f9fbdb69

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 {