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

Commit 3cf8ee76 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge changes from topic "CherryPickMainline" am: caf1d90a am: 1c9c9bb3 

Change-Id: I454a9d8e80e727503869d4397fcac55d91aa73dd
parents d6f6cad3 1c9c9bb3

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

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ public class SubscriptionController extends ISub.Stub { 
    private int getUnusedColor(String callingPackage, String callingFeatureId) {

        List<SubscriptionInfo> availableSubInfos = getActiveSubscriptionInfoList(callingPackage,

                callingFeatureId);

        colorArr = mContext.getResources().getIntArray(com.android.internal.R.array.sim_colors);

        colorArr = mContext.getResources().getIntArray(android.R.array.simColors);

        int colorIdx = 0;



        if (availableSubInfos != null) {

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

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ public class SubscriptionControllerTest extends TelephonyTest { 
        mCallingFeature = null;



        doReturn(1).when(mProxyController).getMaxRafSupported();

        mContextFixture.putIntArrayResource(com.android.internal.R.array.sim_colors, new int[]{5});

        mContextFixture.putIntArrayResource(android.R.array.simColors, new int[]{5});

    }



    @After