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

Commit abd3b3df authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Android (Google) Code Review
Browse files

Merge "Fix subscription management tests on HSUM" into main

parents 03380ac4 2b859fcb

tests/telephonytests/src/com/android/internal/telephony/subscription/SubscriptionManagerServiceTest.java

+14 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ import static org.mockito.Mockito.verify; 


import android.Manifest;

import android.annotation.NonNull;

import android.app.ActivityManager;

import android.app.AppOpsManager;

import android.app.PropertyInvalidatedCache;

import android.compat.testing.PlatformCompatChangeRule;
@@ -1123,9 +1124,12 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 
    public void testGetAccessibleSubscriptionInfoList() {

        doReturn(true).when(mEuiccManager).isEnabled();

        insertSubscription(FAKE_SUBSCRIPTION_INFO2);

        UserHandle user = UserHandle.of(ActivityManager.getCurrentUser());



        doReturn(true).when(mSubscriptionManager).canManageSubscription(

                any(SubscriptionInfo.class), eq(CALLING_PACKAGE));

        doReturn(true).when(mSubscriptionManager).canManageSubscriptionAsUser(

                any(SubscriptionInfo.class), eq(CALLING_PACKAGE), any(UserHandle.class));

        // FAKE_SUBSCRIPTION_INFO2 is a not eSIM. So the list should be empty.

        assertThat(mSubscriptionManagerServiceUT.getAccessibleSubscriptionInfoList(

                CALLING_PACKAGE)).isEmpty();
@@ -1138,6 +1142,8 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 


        doReturn(false).when(mSubscriptionManager).canManageSubscription(

                any(SubscriptionInfo.class), eq(CALLING_PACKAGE));

        doReturn(false).when(mSubscriptionManager).canManageSubscriptionAsUser(

                any(SubscriptionInfo.class), eq(CALLING_PACKAGE), eq(user));



        doReturn(true).when(mEuiccManager).isEnabled();

        assertThat(mSubscriptionManagerServiceUT.getAccessibleSubscriptionInfoList(
@@ -1145,6 +1151,8 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 


        doReturn(true).when(mSubscriptionManager).canManageSubscription(

                any(SubscriptionInfo.class), eq(CALLING_PACKAGE));

        doReturn(true).when(mSubscriptionManager).canManageSubscriptionAsUser(

                any(SubscriptionInfo.class), eq(CALLING_PACKAGE), eq(user));

        assertThat(mSubscriptionManagerServiceUT.getAccessibleSubscriptionInfoList(

                CALLING_PACKAGE)).isEqualTo(List.of(new SubscriptionInfoInternal.Builder(

                        FAKE_SUBSCRIPTION_INFO1).setId(2).build().toSubscriptionInfo()));
@@ -1363,6 +1371,9 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 
        doReturn(true).when(mEuiccManager).isEnabled();

        doReturn(true).when(mSubscriptionManager).canManageSubscription(

                any(SubscriptionInfo.class), eq(CALLING_PACKAGE));

        UserHandle user = UserHandle.of(ActivityManager.getCurrentUser());

        doReturn(true).when(mSubscriptionManager).canManageSubscriptionAsUser(

                any(SubscriptionInfo.class), eq(CALLING_PACKAGE), eq(user));

        assertThat(mSubscriptionManagerServiceUT.getAccessibleSubscriptionInfoList(

                CALLING_PACKAGE)).isEqualTo(List.of(FAKE_SUBSCRIPTION_INFO1.toSubscriptionInfo()));

        // Test getActiveSubIdList, System
@@ -1499,6 +1510,9 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 
        doReturn(true).when(mEuiccManager).isEnabled();

        doReturn(true).when(mSubscriptionManager).canManageSubscription(

                any(SubscriptionInfo.class), eq(CALLING_PACKAGE));

        UserHandle user = UserHandle.of(ActivityManager.getCurrentUser());

        doReturn(true).when(mSubscriptionManager).canManageSubscriptionAsUser(

                any(SubscriptionInfo.class), eq(CALLING_PACKAGE), eq(user));

        assertThat(mSubscriptionManagerServiceUT.getAccessibleSubscriptionInfoList(

                CALLING_PACKAGE)).isEqualTo(List.of(FAKE_SUBSCRIPTION_INFO1.toSubscriptionInfo()));

        // Test getActiveSubIdList, System