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

Commit 5e615bab authored by Daniel Bright's avatar Daniel Bright Committed by Automerger Merge Worker
Browse files

Merge "Remove simColors from public.xml and rename" into rvc-dev am: 056d8410 

Change-Id: Id4904dade74f4f0d969b176f403547266d41684f
parents 0ce415c8 056d8410

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