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

Commit b042f81e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove context from userFeatureProvider" into main

parents a789e921 515c0b8e

src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public class EnterpriseSetDefaultAppsListPreferenceController extends 
        final FeatureFactory factory = FeatureFactory.getFeatureFactory();

        mApplicationFeatureProvider = factory.getApplicationFeatureProvider();

        mEnterprisePrivacyFeatureProvider = factory.getEnterprisePrivacyFeatureProvider(context);

        mUserFeatureProvider = factory.getUserFeatureProvider(context);

        mUserFeatureProvider = factory.getUserFeatureProvider();

        buildAppList();

    }

src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ public class EnterpriseSetDefaultAppsPreferenceController 
        super(context);

        final FeatureFactory factory = FeatureFactory.getFeatureFactory();

        mApplicationFeatureProvider = factory.getApplicationFeatureProvider();

        mUserFeatureProvider = factory.getUserFeatureProvider(context);

        mUserFeatureProvider = factory.getUserFeatureProvider();

    }



    @Override

src/com/android/settings/overlay/FeatureFactory.kt

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ abstract class FeatureFactory { 
    abstract val searchFeatureProvider: SearchFeatureProvider

    abstract fun getSurveyFeatureProvider(context: Context): SurveyFeatureProvider?

    abstract val securityFeatureProvider: SecurityFeatureProvider

    abstract fun getUserFeatureProvider(context: Context): UserFeatureProvider

    abstract val userFeatureProvider: UserFeatureProvider

    abstract val slicesFeatureProvider: SlicesFeatureProvider

    abstract val accountFeatureProvider: AccountFeatureProvider

    abstract val panelFeatureProvider: PanelFeatureProvider

src/com/android/settings/overlay/FeatureFactoryImpl.kt

+1 −3
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ open class FeatureFactoryImpl : FeatureFactory() { 
        )

    }



    private val userFeatureProvider by lazy { UserFeatureProviderImpl(appContext) }



    private val contextualCardFeatureProvider by lazy {

        ContextualCardFeatureProviderImpl(appContext)

    }
@@ -130,7 +128,7 @@ open class FeatureFactoryImpl : FeatureFactory() { 
        SuggestionFeatureProviderImpl()

    }



    override fun getUserFeatureProvider(context: Context) = userFeatureProvider

    override val userFeatureProvider by lazy { UserFeatureProviderImpl(appContext) }



    override val slicesFeatureProvider by lazy { SlicesFeatureProviderImpl() }

tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java

+2 −1
Original line number Diff line number Diff line
@@ -213,8 +213,9 @@ public class FakeFeatureFactory extends FeatureFactory { 
        return securityFeatureProvider;

    }



    @NotNull

    @Override

    public UserFeatureProvider getUserFeatureProvider(Context context) {

    public UserFeatureProvider getUserFeatureProvider() {

        return userFeatureProvider;

    }