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

Commit 056d8410 authored by Daniel Bright's avatar Daniel Bright Committed by Android (Google) Code Review
Browse files

Merge "Remove simColors from public.xml and rename" into rvc-dev

parents 763755f1 b153d59e

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

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

        List<SubscriptionInfo> availableSubInfos = getActiveSubscriptionInfoList(callingPackage,

                callingFeatureId);

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

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

        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
@@ -107,7 +107,7 @@ public class SubscriptionControllerTest extends TelephonyTest { 
        mCallingFeature = mContext.getAttributionTag();



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

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

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

    }



    @After