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

Commit 5a0dc9df authored by Naomi Musgrave's avatar Naomi Musgrave Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fix duplicate dagger binding of MediaProjectionAppSelect...""... 

Merge "Revert "Fix duplicate dagger binding of MediaProjectionAppSelect..."" into udc-qpr-dev am: 5188820e am: 4af30772

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



Change-Id: I4623e5fb6eb02adb566d11bd71bf5631d36efb13
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 42ce6494 4af30772

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -73,7 +73,7 @@ class MediaProjectionAppSelectorActivity( 
    override fun getLayoutResource() = R.layout.media_projection_app_selector

    override fun getLayoutResource() = R.layout.media_projection_app_selector





    public override fun onCreate(bundle: Bundle?) {

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

        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

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

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