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

Commit 6134198b authored by Hunsuk Choi's avatar Hunsuk Choi
Browse files

Make binder call non-blocked in DomainSelectionService 

Decrease the possibility for DomainSelectionService
to block the telephony process.
If a binder call should be blocked, executeMethodAsync
shall be used instead of executeMethodAsyncNoException.

Bug: 324406469
Test: atest DomainSelectionServiceTestOnMockModem
Change-Id: I18167a4dbfa79a61048b0d5df6dca05b2cc946ff
parent 74bd6d36

telephony/java/android/telephony/DomainSelectionService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -831,7 +831,7 @@ public abstract class DomainSelectionService extends Service { 
            @NonNull String tag, @NonNull String errorLogName) {

            @NonNull String tag, @NonNull String errorLogName) {

        try {

        try {

            CompletableFuture.runAsync(

            CompletableFuture.runAsync(

                    () -> TelephonyUtils.runWithCleanCallingIdentity(r), executor).join();

                    () -> TelephonyUtils.runWithCleanCallingIdentity(r), executor);

        } catch (CancellationException | CompletionException e) {

        } catch (CancellationException | CompletionException e) {

            Rlog.w(tag, "Binder - " + errorLogName + " exception: " + e.getMessage());

            Rlog.w(tag, "Binder - " + errorLogName + " exception: " + e.getMessage());

        }

        }