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

Commit 5188820e authored by Naomi Musgrave's avatar Naomi Musgrave Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix duplicate dagger binding of MediaProjectionAppSelect..."" into udc-qpr-dev

parents d9635853 18dee077

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

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

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

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