diff options
| author | Eugene Susla <eugenesusla@google.com> | 2020-11-10 02:37:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 02:37:29 +0000 |
| commit | e618d32b072f53c098f410fa14e9251522b6f3fe (patch) | |
| tree | b679a92615915db605c77a4f4d61e6d20eeb0915 /services/companion | |
| parent | 5fa9d66f1c4075a4cb3a62bf2e109c36bd0c2c37 (diff) | |
| parent | f9fbdb6905b5a3ef58ce8171d24a3e0962289bb7 (diff) | |
Merge "Don't set timeout when showing CDM UI" into rvc-qpr-dev am: f9fbdb6905
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13000085
Change-Id: Ic22f6186f11e61ad5dc545735847332dc47a8055
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 66bbf66e88db..53c725928c78 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 { |