From 18dee077b96d43b5c0d41ea09365d22beb8740dd Mon Sep 17 00:00:00 2001 From: Yalan Yiue Date: Thu, 3 Aug 2023 16:42:14 +0000 Subject: [PATCH] Revert "Fix duplicate dagger binding of MediaProjectionAppSelect..." Revert submission 24195703-fix-dup-binding-media-proj-activity Reason for revert: b/293589247 Reverted changes: /q/submissionid:24195703-fix-dup-binding-media-proj-activity Change-Id: I957890b825e0269b0cfd67477a55b948d0fe1f2a --- .../systemui/media/MediaProjectionAppSelectorActivity.kt | 2 +- .../appselector/MediaProjectionAppSelectorComponent.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt index fdb3ddd7294fc..20a75f96464df 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt @@ -73,7 +73,7 @@ class MediaProjectionAppSelectorActivity( override fun getLayoutResource() = R.layout.media_projection_app_selector public override fun onCreate(bundle: Bundle?) { - component = componentFactory.create(view = this, resultHandler = this) + component = componentFactory.create(activity = this, view = this, resultHandler = this) component.lifecycleObservers.forEach { lifecycle.addObserver(it) } // Create a separate configuration controller for this activity as the configuration diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorComponent.kt b/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorComponent.kt index e0869ac6498e9..11538fadf24e4 100644 --- a/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorComponent.kt +++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorComponent.kt @@ -161,6 +161,7 @@ interface MediaProjectionAppSelectorComponent { interface Factory { /** Create a factory to inject the activity into the graph */ fun create( + @BindsInstance activity: MediaProjectionAppSelectorActivity, @BindsInstance view: MediaProjectionAppSelectorView, @BindsInstance resultHandler: MediaProjectionAppSelectorResultHandler, ): MediaProjectionAppSelectorComponent