Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c941b59d authored by Chris Göllner's avatar Chris Göllner Committed by Android (Google) Code Review
Browse files

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

parents 5143e36b c9e16e63

packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ class MediaProjectionAppSelectorActivity( 


    public override fun onCreate(bundle: Bundle?) {

        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) }



        // Create a separate configuration controller for this activity as the configuration

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

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ 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