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

Commit f7a6a0ca authored by Ling Ma's avatar Ling Ma Committed by Android (Google) Code Review
Browse files

Merge "Wrap subManager creation with createForAllProfiles" into main

parents 4c419e7d 50b219d9

src/com/android/server/telecom/Analytics.java

+1 −1
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ public class Analytics { 


    private static int getCarrierId(Context context) {

        SubscriptionManager subscriptionManager =

                context.getSystemService(SubscriptionManager.class);

                context.getSystemService(SubscriptionManager.class).createForAllUserProfiles();

        List<SubscriptionInfo> subInfos = subscriptionManager.getActiveSubscriptionInfoList();

        if (subInfos == null) {

            return -1;

tests/src/com/android/server/telecom/tests/AnalyticsTests.java

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ public class AnalyticsTests extends TelecomSystemTest { 
        super.setUp();

        // this is a mock

        mSubscriptionManager = mContext.getSystemService(SubscriptionManager.class);

        when(mSubscriptionManager.createForAllUserProfiles()).thenReturn(mSubscriptionManager);

        when(mSubscriptionManager.getActiveSubscriptionInfoList())

                .thenReturn(Collections.emptyList());

    }