diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2021-05-12 22:53:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-12 22:53:00 +0000 |
| commit | 8630738d0a775a2f8e5bc09c437556bd75d8b620 (patch) | |
| tree | 6f59a75348d07612173246ac6c4fca04bde0df2c /java/dagger/internal/codegen/binding/BindingGraphFactory.java | |
| parent | 0cd6a8551365e02a1687415356215ba2061739cd (diff) | |
| parent | 5480a6c05f0c4727b3dd154709f40fdae8d8b4a2 (diff) | |
| download | dagger2-8630738d0a775a2f8e5bc09c437556bd75d8b620.tar.gz | |
Merge "Revert "Merge commit 'upstream/dagger-2.35.1^'"" am: 5882ce8935 am: 5480a6c05f
Original change: https://android-review.googlesource.com/c/platform/external/dagger2/+/1705751
Change-Id: I2f7a4d61b9f48965273925620a8dc0afc43c9bef
Diffstat (limited to 'java/dagger/internal/codegen/binding/BindingGraphFactory.java')
| -rw-r--r-- | java/dagger/internal/codegen/binding/BindingGraphFactory.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/java/dagger/internal/codegen/binding/BindingGraphFactory.java b/java/dagger/internal/codegen/binding/BindingGraphFactory.java index a94f6b01e..2c15e2625 100644 --- a/java/dagger/internal/codegen/binding/BindingGraphFactory.java +++ b/java/dagger/internal/codegen/binding/BindingGraphFactory.java @@ -47,7 +47,6 @@ import dagger.MembersInjector; import dagger.Reusable; import dagger.internal.codegen.base.ClearableCache; import dagger.internal.codegen.base.ContributionType; -import dagger.internal.codegen.base.Keys; import dagger.internal.codegen.base.MapType; import dagger.internal.codegen.base.OptionalType; import dagger.internal.codegen.compileroption.CompilerOptions; @@ -797,7 +796,7 @@ public final class BindingGraphFactory implements ClearableCache { * 2. If there are any explicit bindings in this component, they may conflict with those in * the ancestor component, so resolve them here so that conflicts can be caught. */ - if (getPreviouslyResolvedBindings(key).isPresent() && !Keys.isComponentOrCreator(key)) { + if (getPreviouslyResolvedBindings(key).isPresent()) { /* Resolve in the parent in case there are multibinding contributions or conflicts in some * component between this one and the previously-resolved one. */ parentResolver.get().resolve(key); |