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

Commit 62d0d1b6 authored by Chris Göllner's avatar Chris Göllner Committed by Automerger Merge Worker
Browse files

Merge "Fix duplicate dagger binding of MediaProjectionAppSelectorActivity"... 

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

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



Change-Id: I2b79fd03d08d53dab41310c2a225ab03b88dab7f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a00f52ba d392574d

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