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

Commit e7469df5 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

Merge "Clean up SubMgr#getOpportunisticSubscriptions." 

am: 8cc2a3b6

Change-Id: I52a5b22f9923c913df923dab98119ba8c51416d9
parents 808073d4 8cc2a3b6

src/java/com/android/internal/telephony/SubscriptionController.java

+1 −1
Original line number Diff line number Diff line
@@ -2269,7 +2269,7 @@ public class SubscriptionController extends ISub.Stub { 
    }



    @Override

    public List<SubscriptionInfo> getOpportunisticSubscriptions(int slotId, String callingPackage) {

    public List<SubscriptionInfo> getOpportunisticSubscriptions(String callingPackage) {

        return getSubscriptionInfoListFromCacheHelper(

                callingPackage, mCacheOpportunisticSubInfoList);

    }

tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ public class SubscriptionControllerTest extends TelephonyTest { 
        // Neither sub1 or sub2 are opportunistic. So getOpportunisticSubscriptions

        // should return empty list and no callback triggered.

        List<SubscriptionInfo> opptSubList = mSubscriptionControllerUT

                .getOpportunisticSubscriptions(0, mCallingPackage);

                .getOpportunisticSubscriptions(mCallingPackage);



        assertTrue(opptSubList.isEmpty());

        verify(mTelephonyRegisteryMock, times(0))
@@ -366,7 +366,7 @@ public class SubscriptionControllerTest extends TelephonyTest { 
        verify(mTelephonyRegisteryMock, times(1))

                .notifyOpportunisticSubscriptionInfoChanged();

        opptSubList = mSubscriptionControllerUT

                .getOpportunisticSubscriptions(0, mCallingPackage);

                .getOpportunisticSubscriptions(mCallingPackage);

        assertEquals(1, opptSubList.size());

        assertEquals("test2", opptSubList.get(0).getIccId());