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

Commit 43c03799 authored by Eugene Susla's avatar Eugene Susla
Browse files

Fix Role tests 

Fixes: 132135341
Test: atest CtsRoleTestCases:android.app.role.cts.RoleManagerTest#removeSmsRoleHolderThenDialerRoleAppOpIsNotDenied
Change-Id: Ie940b749ddf8d03bf64709e754f0a9c4c3f45a55
parent 97e0d655

core/java/com/android/internal/infra/ServiceConnector.java

+6 −3
Original line number Diff line number Diff line
@@ -343,15 +343,17 @@ public interface ServiceConnector<I extends IInterface> { 


        @Override

        public <R> AndroidFuture<R> postAsync(@NonNull Job<I, CompletableFuture<R>> job) {

            CompletionAwareJob task = postForResult(job);

            CompletionAwareJob<I, R> task = new CompletionAwareJob<>();

            task.mDelegate = (Job) job;

            task.mAsync = true;

            enqueue(task);

            return task;

        }



        @Override

        public synchronized AndroidFuture<I> connect() {

            if (mServiceConnectionFutureCache == null) {

                mServiceConnectionFutureCache = new CompletionAwareJob<I, I>();

                mServiceConnectionFutureCache = new CompletionAwareJob<>();

                mServiceConnectionFutureCache.mDelegate = s -> s;

                I service = mService;

                if (service != null) {
@@ -366,7 +368,8 @@ public interface ServiceConnector<I extends IInterface> { 
        private void enqueue(@NonNull CompletionAwareJob<I, ?> task) {

            if (!enqueue((Job<I, ?>) task)) {

                task.completeExceptionally(new IllegalStateException(

                        "Failed to post a job to main handler. Likely main looper is exiting"));

                        "Failed to post a job to handler. Likely "

                                + getJobHandler().getLooper() + " is exiting"));

            }

        }