Merge "ContextHubSystemService: Init of ContextHubSystemService in a parallel...

package com.android.server;

import com.android.internal.util.ConcurrentUtils;

import com.android.server.location.ContextHubService;

import com.android.server.SystemServerInitThreadPool;

import android.content.Context;

import android.util.Log;

import java.util.concurrent.Future;

class ContextHubSystemService extends SystemService {

    private static final String TAG = "ContextHubSystemService";

    private final ContextHubService mContextHubService;

    private ContextHubService mContextHubService;

    private Future<?> mInit;

    public ContextHubSystemService(Context context) {

        super(context);

        mInit = SystemServerInitThreadPool.get().submit(() -> {

            mContextHubService = new ContextHubService(context);

        }, "Init ContextHubSystemService");

    }

    @Override

    public void onBootPhase(int phase) {

        if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY) {

            Log.d(TAG, "onBootPhase: PHASE_SYSTEM_SERVICES_READY");

            ConcurrentUtils.waitForFutureNoInterrupt(mInit,

                    "Wait for ContextHubSystemService init");

            mInit = null;

            publishBinderService(Context.CONTEXTHUB_SERVICE, mContextHubService);

        }

    }