Merge "Revert^3 "Change CoreStartable @Dependencies to Injected Map"" into main

 *  abstract fun bind(impl: FoobarStartable): CoreStartable

 *  </pre>

 *

 * If your CoreStartable depends on different CoreStartables starting before it, you can specify

 * another map binding listing out its dependencies:

 *  <pre>

 *  @Provides

 *  @IntoMap

 *  @Dependencies  // Important! com.android.systemui.startable.Dependencies.

 *  @ClassKey(FoobarStartable::class)

 *  fun providesDeps(): Set<Class<out CoreStartable>> {

 *      return setOf(OtherStartable::class.java)

 *  }

 *  </pre>

 *

 * If your CoreStartable depends on different CoreStartables starting before it, use a

 * {@link com.android.systemui.startable.Dependencies} annotation to list out those dependencies.

 *

 * @see SystemUIApplication#startSystemUserServicesIfNeeded()

 */

public interface CoreStartable extends Dumpable {

    String STARTABLE_DEPENDENCIES = "startable_dependencies";

    /** Main entry point for implementations. Called shortly after SysUI startup. */

    void start();

import com.android.systemui.dump.DumpManager;

import com.android.systemui.process.ProcessWrapper;

import com.android.systemui.res.R;

import com.android.systemui.startable.Dependencies;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.util.NotificationChannels;

import java.lang.reflect.InvocationTargetException;

import java.util.ArrayDeque;

import java.util.Arrays;

import java.util.Comparator;

import java.util.HashSet;

import java.util.Map;

import java.util.Set;

import java.util.StringJoiner;

import java.util.TreeMap;

                Map.Entry<Class<?>, Provider<CoreStartable>> entry = queue.removeFirst();

                Class<?> cls = entry.getKey();

                Set<Class<? extends CoreStartable>> deps =

                        mSysUIComponent.getStartableDependencies().get(cls);

                if (deps == null || startedStartables.containsAll(deps)) {

                Dependencies dep = cls.getAnnotation(Dependencies.class);

                Class<?>[] deps = (dep == null ? null : dep.value());

                if (deps == null || startedStartables.containsAll(Arrays.asList(deps))) {

                    String clsName = cls.getName();

                    int i = serviceIndex;  // Copied to make lambda happy.

                    timeInitialization(

            while (!nextQueue.isEmpty()) {

                Map.Entry<Class<?>, Provider<CoreStartable>> entry = nextQueue.removeFirst();

                Class<?> cls = entry.getKey();

                Set<Class<? extends CoreStartable>> deps =

                        mSysUIComponent.getStartableDependencies().get(cls);

                Dependencies dep = cls.getAnnotation(Dependencies.class);

                Class<?>[] deps = (dep == null ? null : dep.value());

                StringJoiner stringJoiner = new StringJoiner(", ");

                for (Class<? extends CoreStartable> c : deps) {

                    if (!startedStartables.contains(c)) {

                        stringJoiner.add(c.getName());

                for (int i = 0; deps != null && i < deps.length; i++) {

                    if (!startedStartables.contains(deps[i])) {

                        stringJoiner.add(deps[i].getName());

                    }

                }

                Log.e(TAG, "Failed to start " + cls.getName()

import com.android.systemui.dump.DumpManager;

import com.android.systemui.keyguard.KeyguardSliceProvider;

import com.android.systemui.people.PeopleProvider;

import com.android.systemui.startable.Dependencies;

import com.android.systemui.statusbar.NotificationInsetsModule;

import com.android.systemui.statusbar.QsFrameTranslateModule;

import com.android.systemui.statusbar.policy.ConfigurationController;

import java.util.Map;

import java.util.Optional;

import java.util.Set;

import javax.inject.Provider;

     */

    @PerUser Map<Class<?>, Provider<CoreStartable>> getPerUserStartables();

    /**

     * Returns {@link CoreStartable} dependencies if there are any.

     */

    @Dependencies Map<Class<?>, Set<Class<? extends CoreStartable>>> getStartableDependencies();

    /**

     * Member injection into the supplied argument.

     */

import com.android.systemui.BootCompleteCache;

import com.android.systemui.BootCompleteCacheImpl;

import com.android.systemui.CameraProtectionModule;

import com.android.systemui.CoreStartable;

import com.android.systemui.SystemUISecondaryUserService;

import com.android.systemui.accessibility.AccessibilityModule;

import com.android.systemui.accessibility.data.repository.AccessibilityRepositoryModule;

import com.android.systemui.shade.transition.LargeScreenShadeInterpolatorImpl;

import com.android.systemui.shared.condition.Monitor;

import com.android.systemui.smartspace.dagger.SmartspaceModule;

import com.android.systemui.startable.Dependencies;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import dagger.Provides;

import dagger.multibindings.ClassKey;

import dagger.multibindings.IntoMap;

import dagger.multibindings.Multibinds;

import kotlinx.coroutines.CoroutineScope;

import java.util.Collections;

import java.util.Map;

import java.util.Optional;

import java.util.Set;

import java.util.concurrent.Executor;

import javax.inject.Named;

        })

public abstract class SystemUIModule {

    @Multibinds

    @Dependencies

    abstract Map<Class<?>, Set<Class<? extends CoreStartable>>> startableDependencyMap();

    @Binds

    abstract BootCompleteCache bindBootCompleteCache(BootCompleteCacheImpl bootCompleteCache);

package com.android.systemui.startable

import com.android.systemui.CoreStartable

import java.lang.annotation.Documented

import javax.inject.Qualifier

import kotlin.reflect.KClass

/**

 * Allows a [CoreStartable] to declare that it must be started after its dependencies.

 * This creates a partial, topological ordering. See [com.android.systemui.SystemUIApplication] for

 * how this ordering is enforced at runtime.

 */

@Qualifier @Documented @Retention(AnnotationRetention.RUNTIME) annotation class Dependencies()

@MustBeDocumented

@Target(AnnotationTarget.CLASS)

@Retention(AnnotationRetention.RUNTIME)

annotation class Dependencies(vararg val value: KClass<*> = [])