Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ic22f6186f11e61ad5dc545735847332dc47a8055
This commit is contained in:
Eugene Susla
2020-11-10 02:37:29 +00:00
committed by Automerger Merge Worker
parent 5fa9d66f1c f9fbdb6905
commit e618d32b07
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -308,7 +308,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
AndroidFuture<Association> future = new AndroidFuture<>(); AndroidFuture<Association> future = new AndroidFuture<>();
service.startDiscovery(request, callingPackage, callback, future); service.startDiscovery(request, callingPackage, callback, future);
return future; return future;
}).whenComplete(uncheckExceptions((association, err) -> { }).cancelTimeout().whenComplete(uncheckExceptions((association, err) -> {
if (err == null) { if (err == null) {
addAssociation(association); addAssociation(association);
} else { } else {