diff options
| author | Eugene Susla <eugenesusla@google.com> | 2020-10-05 12:21:33 -0700 |
|---|---|---|
| committer | Eugene Susla <eugenesusla@google.com> | 2020-11-09 21:34:27 +0000 |
| commit | 635d7aebcd0f07efb9f94ee22f0d4383e9107733 (patch) | |
| tree | 6439fe152ce022e1f322b3c38a7c2eb16aeb0895 /services/companion | |
| parent | d3a425504e546c15cb93f4a621738b9982244885 (diff) | |
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)
Diffstat (limited to 'services/companion')
| -rw-r--r-- | services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |