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

Commit d8b316f8 authored by Fan Zhang's avatar Fan Zhang
Browse files

Remove mainline module feature flag checks. 

They are turned on for a while now.

Fixes: 123648279
Test: robotests
Change-Id: Ibec7a10d49387207697635190a237807f1807628
parent 44427259

src/com/android/settings/core/FeatureFlags.java

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ public class FeatureFlags { 
    public static final String MOBILE_NETWORK_V2 = "settings_mobile_network_v2";

    public static final String NETWORK_INTERNET_V2 = "settings_network_and_internet_v2";

    public static final String SLICE_INJECTION = "settings_slice_injection";

    public static final String MAINLINE_MODULE = "settings_mainline_module";

    public static final String WIFI_DETAILS_SAVED_SCREEN = "settings_wifi_details_saved_screen";

    public static final String WIFI_DETAILS_DATAUSAGE_HEADER =

            "settings_wifi_details_datausage_header";

src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java

+0 −8
Original line number Diff line number Diff line
@@ -21,14 +21,12 @@ import android.content.Intent; 
import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.text.TextUtils;

import android.util.FeatureFlagUtils;

import android.util.Log;



import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;



import com.android.settings.core.BasePreferenceController;

import com.android.settings.core.FeatureFlags;



public class MainlineModuleVersionPreferenceController extends BasePreferenceController {
@@ -49,16 +47,10 @@ public class MainlineModuleVersionPreferenceController extends BasePreferenceCon 


    @Override

    public int getAvailabilityStatus() {

        if (!FeatureFlagUtils.isEnabled(mContext, FeatureFlags.MAINLINE_MODULE)) {

            return UNSUPPORTED_ON_DEVICE;

        }

        return !TextUtils.isEmpty(mModuleVersion) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;

    }



    private void initModules() {

        if (!FeatureFlagUtils.isEnabled(mContext, FeatureFlags.MAINLINE_MODULE)) {

            return;

        }

        final String moduleProvider = mContext.getString(

                com.android.internal.R.string.config_defaultModuleMetadataProvider);

        if (!TextUtils.isEmpty(moduleProvider)) {

tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java

+0 −12
Original line number Diff line number Diff line
@@ -60,18 +60,6 @@ public class MainlineModuleVersionPreferenceControllerTest { 
        mContext = spy(RuntimeEnvironment.application);

        mPreference = new Preference(mContext);

        when(mContext.getPackageManager()).thenReturn(mPackageManager);



        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.MAINLINE_MODULE, true);

    }



    @Test

    public void getAvailabilityStatus_featureDisabled_unavailable() {

        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.MAINLINE_MODULE, false);



        final MainlineModuleVersionPreferenceController controller =

                new MainlineModuleVersionPreferenceController(mContext, "key");



        assertThat(controller.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);

    }



    @Test