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

Commit 4a47aeea authored by Evan Laird's avatar Evan Laird
Browse files

One fewer DependencyProvider 

`grep -r "(class|interface) DependencyProvider" returns 3 separate
entities claming to be DependencyProvider, which is a little confusing
and unnecessary. Privatized and renamed Dependency.DependencyProvider to
Dependency.LazyDependencyCreator, since I think that's a little bit
closer to what it is

Test: build systemui; atest SystemUITests
Change-Id: I2eed5be889b6c75324c2cf5cfef5d55827dbd8c5
parent 9a3c1f1d

packages/SystemUI/src/com/android/systemui/Dependency.java

+7 −3
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ public class Dependency extends SystemUI { 
            new DependencyKey<>(LEAK_REPORT_EMAIL_NAME);



    private final ArrayMap<Object, Object> mDependencies = new ArrayMap<>();

    private final ArrayMap<Object, DependencyProvider> mProviders = new ArrayMap<>();

    private final ArrayMap<Object, LazyDependencyCreator> mProviders = new ArrayMap<>();



    @Inject Lazy<ActivityStarter> mActivityStarter;

    @Inject Lazy<ActivityStarterDelegate> mActivityStarterDelegate;
@@ -510,7 +510,7 @@ public class Dependency extends SystemUI { 
        Preconditions.checkArgument(cls instanceof DependencyKey<?> || cls instanceof Class<?>);



        @SuppressWarnings("unchecked")

        DependencyProvider<T> provider = mProviders.get(cls);

        LazyDependencyCreator<T> provider = mProviders.get(cls);

        if (provider == null) {

            throw new IllegalArgumentException("Unsupported dependency " + cls

                    + ". " + mProviders.size() + " providers known.");
@@ -520,7 +520,11 @@ public class Dependency extends SystemUI { 


    private static Dependency sDependency;



    public interface DependencyProvider<T> {

    /**

     * Interface for a class that can create a dependency. Used to implement laziness

     * @param <T> The type of the dependency being created

     */

    private interface LazyDependencyCreator<T> {

        T createDependency();

    }