summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yalan Yiue <yyalan@google.com> 2023-08-03 16:42:14 +0000
committer Nick Chameyev <nickchameyev@google.com> 2023-08-03 18:01:11 +0000
commit18dee077b96d43b5c0d41ea09365d22beb8740dd (patch)
treef28711746bb546372ecce51010873f44f5b0a84c
parent36d7fcd6a3574775514de649d941a7769e25a6c8 (diff)
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
-rw-r--r--packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt2
-rw-r--r--packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorComponent.kt1
2 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt
index fdb3ddd7294f..20a75f96464d 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 e0869ac6498e..11538fadf24e 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