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

Commit e90622bf authored by Ling Ma's avatar Ling Ma
Browse files

Release QS_SECONDARY_DATA_SUB_INFO flag 

Release the flag on U.

Bug: 244064524
Test: manual
Change-Id: I1fafe71aef577849104b7d0095b1d7cf0283767b
parent e3465749

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+1 −3
Original line number Diff line number Diff line
@@ -207,9 +207,7 @@ object Flags { 
    @JvmField val NEW_FOOTER_ACTIONS = releasedFlag(507, "new_footer_actions")



    // TODO(b/244064524): Tracking Bug

    @JvmField

    val QS_SECONDARY_DATA_SUB_INFO =

        unreleasedFlag(508, "qs_secondary_data_sub_info", teamfood = true)

    @JvmField val QS_SECONDARY_DATA_SUB_INFO = releasedFlag(508, "qs_secondary_data_sub_info")



    // 600- status bar

    // TODO(b/254513246): Tracking Bug

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java

+12 −11
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ import com.android.systemui.R; 
import com.android.systemui.SysuiTestCase;

import com.android.systemui.animation.DialogLaunchAnimator;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.UnreleasedFlag;

import com.android.systemui.flags.FakeFeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.statusbar.connectivity.AccessPointController;

import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -169,8 +169,8 @@ public class InternetDialogControllerTest extends SysuiTestCase { 
    private WifiStateWorker mWifiStateWorker;

    @Mock

    private SignalStrength mSignalStrength;

    @Mock

    private FeatureFlags mFlags;



    private FakeFeatureFlags mFlags = new FakeFeatureFlags();



    private TestableResources mTestableResources;

    private InternetDialogController mInternetDialogController;
@@ -221,6 +221,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { 
        mInternetDialogController.onAccessPointsChanged(mAccessPoints);

        mInternetDialogController.mActivityStarter = mActivityStarter;

        mInternetDialogController.mWifiIconInjector = mWifiIconInjector;

        mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, false);

    }



    @After
@@ -410,7 +411,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { 


    @Test

    public void getSubtitleText_withNoService_returnNoNetworksAvailable() {

        when(mFlags.isEnabled(any(UnreleasedFlag.class))).thenReturn(true);

        mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, true);

        InternetDialogController spyController = spy(mInternetDialogController);

        fakeAirplaneModeEnabled(false);

        when(mWifiStateWorker.isWifiEnabled()).thenReturn(true);
@@ -767,7 +768,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { 


    @Test

    public void getSignalStrengthIcon_differentSubId() {

        when(mFlags.isEnabled(any(UnreleasedFlag.class))).thenReturn(true);

        mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, true);

        InternetDialogController spyController = spy(mInternetDialogController);

        Drawable icons = spyController.getSignalStrengthIcon(SUB_ID, mContext, 1, 1, 0, false);

        Drawable icons2 = spyController.getSignalStrengthIcon(SUB_ID2, mContext, 1, 1, 0, false);
@@ -777,7 +778,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { 


    @Test

    public void getActiveAutoSwitchNonDdsSubId() {

        when(mFlags.isEnabled(any(UnreleasedFlag.class))).thenReturn(true);

        mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, true);

        // active on non-DDS

        SubscriptionInfo info = mock(SubscriptionInfo.class);

        doReturn(SUB_ID2).when(info).getSubscriptionId();
@@ -813,7 +814,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { 


    @Test

    public void getMobileNetworkSummary() {

        when(mFlags.isEnabled(any(UnreleasedFlag.class))).thenReturn(true);

        mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, true);

        InternetDialogController spyController = spy(mInternetDialogController);

        doReturn(SUB_ID2).when(spyController).getActiveAutoSwitchNonDdsSubId();

        doReturn(true).when(spyController).isMobileDataEnabled();
@@ -837,7 +838,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { 


    @Test

    public void launchMobileNetworkSettings_validSubId() {

        when(mFlags.isEnabled(any(UnreleasedFlag.class))).thenReturn(true);

        mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, true);

        InternetDialogController spyController = spy(mInternetDialogController);

        doReturn(SUB_ID2).when(spyController).getActiveAutoSwitchNonDdsSubId();

        spyController.launchMobileNetworkSettings(mDialogLaunchView);
@@ -848,7 +849,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { 


    @Test

    public void launchMobileNetworkSettings_invalidSubId() {

        when(mFlags.isEnabled(any(UnreleasedFlag.class))).thenReturn(true);

        mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, true);

        InternetDialogController spyController = spy(mInternetDialogController);

        doReturn(SubscriptionManager.INVALID_SUBSCRIPTION_ID)

                .when(spyController).getActiveAutoSwitchNonDdsSubId();
@@ -860,7 +861,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { 


    @Test

    public void setAutoDataSwitchMobileDataPolicy() {

        when(mFlags.isEnabled(any(UnreleasedFlag.class))).thenReturn(true);

        mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, true);

        mInternetDialogController.setAutoDataSwitchMobileDataPolicy(SUB_ID, true);



        verify(mTelephonyManager).setMobileDataPolicyEnabled(eq(