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

Commit 817fb75d authored by Tom Hsu's avatar Tom Hsu Committed by Automerger Merge Worker
Browse files

Merge "Avoid NTN info show on InternetDialog." into 24D1-dev am: 19f2c0ff 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27333099



Change-Id: I96b95cc55c4f6d673f75e87f96e8dd6d920c5db1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e0927fed 19f2c0ff

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

+4 −0
Original line number Diff line number Diff line
@@ -936,6 +936,10 @@ public class InternetDialogController implements AccessPointController.AccessPoi 
            mHasActiveSubIdOnDds = false;

            Log.e(TAG, "Can't get DDS subscriptionInfo");

            return;

        } else if (ddsSubInfo.isOnlyNonTerrestrialNetwork()) {

            mHasActiveSubIdOnDds = false;

            Log.d(TAG, "This is NTN, so do not show mobile data");

            return;

        }



        mHasActiveSubIdOnDds = isEmbeddedSubscriptionVisible(ddsSubInfo);

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

+28 −0
Original line number Diff line number Diff line
@@ -1116,6 +1116,34 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase { 
        assertThat(mInternetDialogController.hasActiveSubIdOnDds()).isFalse();

    }



    @Test

    public void hasActiveSubIdOnDds_activeDdsAndIsOnlyNonTerrestrialNetwork_returnFalse() {

        when(SubscriptionManager.getDefaultDataSubscriptionId())

                .thenReturn(SUB_ID);

        SubscriptionInfo info = mock(SubscriptionInfo.class);

        when(info.isEmbedded()).thenReturn(true);

        when(info.isOnlyNonTerrestrialNetwork()).thenReturn(true);

        when(mSubscriptionManager.getActiveSubscriptionInfo(SUB_ID)).thenReturn(info);



        mInternetDialogController.mOnSubscriptionsChangedListener.onSubscriptionsChanged();



        assertFalse(mInternetDialogController.hasActiveSubIdOnDds());

    }



    @Test

    public void hasActiveSubIdOnDds_activeDdsAndIsNotOnlyNonTerrestrialNetwork_returnTrue() {

        when(SubscriptionManager.getDefaultDataSubscriptionId())

                .thenReturn(SUB_ID);

        SubscriptionInfo info = mock(SubscriptionInfo.class);

        when(info.isEmbedded()).thenReturn(true);

        when(info.isOnlyNonTerrestrialNetwork()).thenReturn(false);

        when(mSubscriptionManager.getActiveSubscriptionInfo(SUB_ID)).thenReturn(info);



        mInternetDialogController.mOnSubscriptionsChangedListener.onSubscriptionsChanged();



        assertTrue(mInternetDialogController.hasActiveSubIdOnDds());

    }



    private String getResourcesString(String name) {

        return mContext.getResources().getString(getResourcesId(name));

    }