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/hilt/android/internal/lifecycle/HiltViewModelFactory.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/hilt/android/internal/lifecycle/HiltViewModelFactory.java')
| -rw-r--r-- | java/dagger/hilt/android/internal/lifecycle/HiltViewModelFactory.java | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/java/dagger/hilt/android/internal/lifecycle/HiltViewModelFactory.java b/java/dagger/hilt/android/internal/lifecycle/HiltViewModelFactory.java index 443894127..3b0d3bc43 100644 --- a/java/dagger/hilt/android/internal/lifecycle/HiltViewModelFactory.java +++ b/java/dagger/hilt/android/internal/lifecycle/HiltViewModelFactory.java @@ -16,7 +16,6 @@ package dagger.hilt.android.internal.lifecycle; -import android.app.Activity; import androidx.lifecycle.AbstractSavedStateViewModelFactory; import androidx.lifecycle.SavedStateHandle; import androidx.lifecycle.ViewModel; @@ -29,7 +28,6 @@ import dagger.Module; import dagger.hilt.EntryPoint; import dagger.hilt.EntryPoints; import dagger.hilt.InstallIn; -import dagger.hilt.android.components.ActivityComponent; import dagger.hilt.android.components.ViewModelComponent; import dagger.hilt.android.internal.builders.ViewModelComponentBuilder; import dagger.multibindings.Multibinds; @@ -111,28 +109,4 @@ public final class HiltViewModelFactory implements ViewModelProvider.Factory { return delegateFactory.create(modelClass); } } - - @EntryPoint - @InstallIn(ActivityComponent.class) - interface ActivityCreatorEntryPoint { - @HiltViewModelMap.KeySet - Set<String> getViewModelKeys(); - ViewModelComponentBuilder getViewModelComponentBuilder(); - } - - public static ViewModelProvider.Factory createInternal( - @NonNull Activity activity, - @NonNull SavedStateRegistryOwner owner, - @Nullable Bundle defaultArgs, - @NonNull ViewModelProvider.Factory delegateFactory) { - ActivityCreatorEntryPoint entryPoint = - EntryPoints.get(activity, ActivityCreatorEntryPoint.class); - return new HiltViewModelFactory( - owner, - defaultArgs, - entryPoint.getViewModelKeys(), - delegateFactory, - entryPoint.getViewModelComponentBuilder() - ); - } } |