Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix duplicate dagger binding of MediaProjectionAppSelectorActivity" into udc-qpr-dev am: c941b59d87

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24195703

Change-Id: I21a1b5f6c5b17a01d6aa2ecaa32b5f4247751f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Göllner
2023-07-26 15:27:42 +00:00
committed by Automerger Merge Worker
parent d8720e8f1b c941b59d87
commit d392574dfa
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt
View File

@@ -85,7 +85,7 @@ class MediaProjectionAppSelectorActivity(
public override fun onCreate(bundle: Bundle?) { public override fun onCreate(bundle: Bundle?) {
lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE) lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
component = componentFactory.create(activity = this, view = this, resultHandler = this) component = componentFactory.create(view = this, resultHandler = this)
component.lifecycleObservers.forEach { lifecycle.addObserver(it) } component.lifecycleObservers.forEach { lifecycle.addObserver(it) }
// Create a separate configuration controller for this activity as the configuration // Create a separate configuration controller for this activity as the configuration

1
packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorComponent.kt
View File

@@ -161,7 +161,6 @@ interface MediaProjectionAppSelectorComponent {
interface Factory { interface Factory {
/** Create a factory to inject the activity into the graph */ /** Create a factory to inject the activity into the graph */
fun create( fun create(
@BindsInstance activity: MediaProjectionAppSelectorActivity,
@BindsInstance view: MediaProjectionAppSelectorView, @BindsInstance view: MediaProjectionAppSelectorView,
@BindsInstance resultHandler: MediaProjectionAppSelectorResultHandler, @BindsInstance resultHandler: MediaProjectionAppSelectorResultHandler,
): MediaProjectionAppSelectorComponent ): MediaProjectionAppSelectorComponent