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

Commit d1061cd3 authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Android (Google) Code Review
Browse files

Merge "access system resources with android.R package"

parents d5301c3a f0f9dc9a

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

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,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
@@ -101,7 +101,7 @@ public class SubscriptionControllerTest extends TelephonyTest { 
        mCallingFeature = mContext.getFeatureId();



        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