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

Commit 508b6188 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Convert extension functions to regular functions. 

An incoming upgrade to dagger 2.50 explicitly prevents using extension
functions in modules: https://aosp.corp.google.com/2893980.

https://github.com/google/dagger/commit/b37cffd6a9bb58c7bbe2f39f53b761168d5235fb

Flag: NA
Fixes: 318405239
Test: m SystemUI
Change-Id: I5c5e34497f6dd05cdb67d7d65ac335db617ebb25
Merged-In: I5c5e34497f6dd05cdb67d7d65ac335db617ebb25
parent 76a8cf40

packages/SystemUI/src/com/android/systemui/notetask/NoteTaskModule.kt

+9 −7
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.app.Service 
import android.app.role.RoleManager

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.Flags

import com.android.systemui.notetask.NoteTaskBubblesController.NoteTaskBubblesService

import com.android.systemui.notetask.quickaffordance.NoteTaskQuickAffordanceModule

import com.android.systemui.notetask.shortcut.CreateNoteTaskShortcutActivity

import com.android.systemui.notetask.shortcut.LaunchNoteTaskActivity
@@ -37,20 +38,21 @@ import dagger.multibindings.IntoMap 
interface NoteTaskModule {



    @[Binds IntoMap ClassKey(NoteTaskControllerUpdateService::class)]

    fun NoteTaskControllerUpdateService.bindNoteTaskControllerUpdateService(): Service

    fun bindNoteTaskControllerUpdateService(service: NoteTaskControllerUpdateService): Service



    @[Binds IntoMap ClassKey(NoteTaskBubblesController.NoteTaskBubblesService::class)]

    fun NoteTaskBubblesController.NoteTaskBubblesService.bindNoteTaskBubblesService(): Service

    @[Binds IntoMap ClassKey(NoteTaskBubblesService::class)]

    fun bindNoteTaskBubblesService(service: NoteTaskBubblesService): Service



    @[Binds IntoMap ClassKey(LaunchNoteTaskActivity::class)]

    fun LaunchNoteTaskActivity.bindNoteTaskLauncherActivity(): Activity

    fun bindNoteTaskLauncherActivity(activity: LaunchNoteTaskActivity): Activity



    @[Binds IntoMap ClassKey(LaunchNotesRoleSettingsTrampolineActivity::class)]

    fun LaunchNotesRoleSettingsTrampolineActivity.bindLaunchNotesRoleSettingsTrampolineActivity():

        Activity

    fun bindLaunchNotesRoleSettingsTrampolineActivity(

        activity: LaunchNotesRoleSettingsTrampolineActivity

    ): Activity



    @[Binds IntoMap ClassKey(CreateNoteTaskShortcutActivity::class)]

    fun CreateNoteTaskShortcutActivity.bindNoteTaskShortcutActivity(): Activity

    fun bindNoteTaskShortcutActivity(activity: CreateNoteTaskShortcutActivity): Activity



    companion object {

packages/SystemUI/src/com/android/systemui/notetask/quickaffordance/NoteTaskQuickAffordanceModule.kt

+3 −1
Original line number Diff line number Diff line
@@ -25,5 +25,7 @@ import dagger.multibindings.IntoSet 
interface NoteTaskQuickAffordanceModule {



    @[Binds IntoSet]

    fun NoteTaskQuickAffordanceConfig.bindNoteTaskQuickAffordance(): KeyguardQuickAffordanceConfig

    fun bindNoteTaskQuickAffordance(

        impl: NoteTaskQuickAffordanceConfig

    ): KeyguardQuickAffordanceConfig

}