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

Commit dd91b0e7 authored by Rubin Xu's avatar Rubin Xu Committed by Automerger Merge Worker
Browse files

Merge "Increase timeout for setDefaultDialerApplication" into udc-dev am: 4237cb28 

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



Change-Id: I165bcb19b6cfff1c4185d8cee233f668049a4dd6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e8cd03c1 4237cb28

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -11424,7 +11424,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                    RoleManager.ROLE_DIALER, packageName, 0, UserHandle.of(callerUserId),

                    AsyncTask.THREAD_POOL_EXECUTOR, callback);

            try {

                future.get(5, TimeUnit.SECONDS);

                future.get(20, TimeUnit.SECONDS);

            } catch (TimeoutException e) {

                throw new IllegalArgumentException("Timeout when setting the app as the dialer", e);

            } catch (ExecutionException e) {