Merge "Block Binder thread until incoming call process completes" into tm-dev

import java.util.Optional;

import java.util.Queue;

import java.util.Set;

import java.util.concurrent.CancellationException;

import java.util.concurrent.CompletableFuture;

import java.util.concurrent.CompletionException;

import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.ConcurrentLinkedQueue;

import java.util.concurrent.Executor;

        @Override

        public void onIncomingCall(IImsCallSession c, Bundle extras) {

            TelephonyUtils.runWithCleanCallingIdentity(()-> processIncomingCall(c, extras),

                    mExecutor);

            // we want to ensure we block this binder thread until incoming call setup completes

            // as to avoid race conditions where the ImsService tries to update the state of the

            // call before the listeners have been attached.

            executeAndWait(()-> processIncomingCall(c, extras));

        }

        @Override

                }

            }, mExecutor);

        }

        /**

         * Schedule the given Runnable on mExecutor and block this thread until it finishes.

         * @param r The Runnable to run.

         */

        private void executeAndWait(Runnable r) {

            try {

                CompletableFuture.runAsync(

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

            } catch (CancellationException | CompletionException e) {

                logw("Binder - exception: " + e.getMessage());

            }

        }

    }

    /**