From 635d7aebcd0f07efb9f94ee22f0d4383e9107733 Mon Sep 17 00:00:00 2001
From: Eugene Susla <eugenesusla@google.com>
Date: Mon, 5 Oct 2020 12:21:33 -0700
Subject: 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 9820b8ffb5be7ea80e0ee478373d6fffaec11bdc)
---
 .../com/android/server/companion/CompanionDeviceManagerService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
index 29fc1674bab9..a31050c2d999 100644
--- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
@@ -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 {
-- 
cgit v1.2.3-59-g8ed1b