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

Commit b2b29d76 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Remove ability to inject aconfig flags. 

Flag: NA
Bug: 308482106
Test: built
Change-Id: I869cf0334b78b980cde847fb94fc214fd4c9b58d
parent 9c6b8fee

packages/SystemUI/src/com/android/systemui/aconfig/AConfigModule.kt

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.aconfig



import com.android.systemui.FeatureFlags

import com.android.systemui.FeatureFlagsImpl

import com.android.systemui.dagger.SysUISingleton

import dagger.Module

import dagger.Provides



@Module

abstract class AConfigModule {

    @Module

    companion object {

        @Provides

        @SysUISingleton

        fun providesImpl(): FeatureFlags {

            return FeatureFlagsImpl()

        }

    }

}

packages/SystemUI/src/com/android/systemui/communal/data/repository/CommunalRepository.kt

+2 −5
Original line number Diff line number Diff line 
package com.android.systemui.communal.data.repository



import com.android.systemui.FeatureFlags

import com.android.systemui.Flags.communalHub

import com.android.systemui.communal.shared.model.CommunalSceneKey

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.flags.FeatureFlagsClassic
@@ -29,13 +29,10 @@ interface CommunalRepository { 
class CommunalRepositoryImpl

@Inject

constructor(

    private val featureFlags: FeatureFlags,

    private val featureFlagsClassic: FeatureFlagsClassic,

) : CommunalRepository {

    override val isCommunalEnabled: Boolean

        get() =

            featureFlagsClassic.isEnabled(Flags.COMMUNAL_SERVICE_ENABLED) &&

                featureFlags.communalHub()

        get() = featureFlagsClassic.isEnabled(Flags.COMMUNAL_SERVICE_ENABLED) && communalHub()



    private val _desiredScene: MutableStateFlow<CommunalSceneKey> =

        MutableStateFlow(CommunalSceneKey.Blank)

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+0 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import com.android.systemui.BootCompleteCache; 
import com.android.systemui.BootCompleteCacheImpl;

import com.android.systemui.accessibility.AccessibilityModule;

import com.android.systemui.accessibility.data.repository.AccessibilityRepositoryModule;

import com.android.systemui.aconfig.AConfigModule;

import com.android.systemui.appops.dagger.AppOpsModule;

import com.android.systemui.assist.AssistModule;

import com.android.systemui.authentication.AuthenticationModule;
@@ -163,7 +162,6 @@ import javax.inject.Named; 
@Module(includes = {

        AccessibilityModule.class,

        AccessibilityRepositoryModule.class,

        AConfigModule.class,

        AppOpsModule.class,

        AssistModule.class,

        AuthenticationModule.class,

packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsClassicDebug.java

+6 −11
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.flags;



import static com.android.systemui.Flags.exampleFlag;

import static com.android.systemui.Flags.sysuiTeamfood;

import static com.android.systemui.flags.FlagManager.ACTION_GET_FLAGS;

import static com.android.systemui.flags.FlagManager.ACTION_SET_FLAG;

import static com.android.systemui.flags.FlagManager.EXTRA_FLAGS;
@@ -38,13 +39,10 @@ import android.util.Log; 
import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.systemui.FeatureFlags;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.util.settings.GlobalSettings;



import org.jetbrains.annotations.NotNull;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Map;
@@ -83,7 +81,6 @@ public class FeatureFlagsClassicDebug implements FeatureFlagsClassic { 
    private final Map<String, Boolean> mBooleanFlagCache = new ConcurrentHashMap<>();

    private final Map<String, String> mStringFlagCache = new ConcurrentHashMap<>();

    private final Map<String, Integer> mIntFlagCache = new ConcurrentHashMap<>();

    private final FeatureFlags mGantryFlags;

    private final Restarter mRestarter;



    private final ServerFlagReader.ChangeListener mOnPropertiesChanged =
@@ -128,7 +125,6 @@ public class FeatureFlagsClassicDebug implements FeatureFlagsClassic { 
            @Main Resources resources,

            ServerFlagReader serverFlagReader,

            @Named(ALL_FLAGS) Map<String, Flag<?>> allFlags,

            FeatureFlags gantryFlags,

            Restarter restarter) {

        mFlagManager = flagManager;

        mContext = context;
@@ -137,7 +133,6 @@ public class FeatureFlagsClassicDebug implements FeatureFlagsClassic { 
        mSystemProperties = systemProperties;

        mServerFlagReader = serverFlagReader;

        mAllFlags = allFlags;

        mGantryFlags = gantryFlags;

        mRestarter = restarter;

    }
@@ -155,16 +150,16 @@ public class FeatureFlagsClassicDebug implements FeatureFlagsClassic { 
    }



    @Override

    public boolean isEnabled(@NotNull UnreleasedFlag flag) {

    public boolean isEnabled(@NonNull UnreleasedFlag flag) {

        return isEnabledInternal(flag);

    }



    @Override

    public boolean isEnabled(@NotNull ReleasedFlag flag) {

    public boolean isEnabled(@NonNull ReleasedFlag flag) {

        return isEnabledInternal(flag);

    }



    private boolean isEnabledInternal(@NotNull BooleanFlag flag) {

    private boolean isEnabledInternal(@NonNull BooleanFlag flag) {

        String name = flag.getName();



        Boolean value = mBooleanFlagCache.get(name);
@@ -266,7 +261,7 @@ public class FeatureFlagsClassicDebug implements FeatureFlagsClassic { 
                && !defaultValue

                && result == null

                && flag.getTeamfood()) {

            return mGantryFlags.sysuiTeamfood();

            return sysuiTeamfood();

        }



        return result == null ? mServerFlagReader.readServerOverride(
@@ -539,7 +534,7 @@ public class FeatureFlagsClassicDebug implements FeatureFlagsClassic { 
    @Override

    public void dump(@NonNull PrintWriter pw, @NonNull String[] args) {

        pw.println("can override: true");

        pw.println("teamfood: " + mGantryFlags.sysuiTeamfood());

        pw.println("teamfood: " + sysuiTeamfood());

        pw.println("booleans: " + mBooleanFlagCache.size());

        pw.println("example_flag: " + exampleFlag());

        pw.println("example_shared_flag: " + exampleSharedFlag());

packages/SystemUI/src/com/android/systemui/scene/shared/flag/SceneContainerFlags.kt

+2 −3
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
package com.android.systemui.scene.shared.flag



import androidx.annotation.VisibleForTesting

import com.android.systemui.FeatureFlags

import com.android.systemui.Flags as AConfigFlags

import com.android.systemui.Flags.sceneContainer

import com.android.systemui.compose.ComposeFacade

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.flags.FeatureFlagsClassic
@@ -50,7 +50,6 @@ class SceneContainerFlagsImpl 
@AssistedInject

constructor(

    private val featureFlagsClassic: FeatureFlagsClassic,

    featureFlags: FeatureFlags,

    @Assisted private val isComposeAvailable: Boolean,

) : SceneContainerFlags {
@@ -72,7 +71,7 @@ constructor( 
        listOf(

            AconfigFlagMustBeEnabled(

                flagName = AConfigFlags.FLAG_SCENE_CONTAINER,

                flagValue = featureFlags.sceneContainer(),

                flagValue = sceneContainer(),

            ),

        ) +

            classicFlagTokens.map { flagToken -> FlagMustBeEnabled(flagToken) } +