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

Commit b27583a6 authored by Daniel Bright's avatar Daniel Bright
Browse files

Remove simColors from public.xml and rename 

* Renaming simColors back to sim_colors
* Remove simColors from public.xml

Bug: 143289541
Test: N/a
Merged-In: I263869221fff9af500adae012e8af9c1545f51f1
Change-Id: I263869221fff9af500adae012e8af9c1545f51f1
parent 98f5c24b

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