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

Commit 3ccf865e authored by Daniel Bright's avatar Daniel Bright Committed by Gerrit Code Review
Browse files

Merge "Remove simColors from public.xml and rename"

parents 17d06563 b27583a6

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

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,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
@@ -102,7 +102,7 @@ public class SubscriptionControllerTest extends TelephonyTest { 
        mCallingFeature = null;



        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