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

Commit 7f038555 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Get system resources instead of phone context" 

am: 7fc619b8

Change-Id: I22cac9188472b44cc9aecb132186a79f9c8b7334
parents 05b47b68 7fc619b8

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

+2 −2
Original line number Diff line number Diff line
@@ -2002,9 +2002,9 @@ public class ServiceStateTracker extends Handler { 
     */

    private boolean isRoamIndForHomeSystem(String roamInd) {

        // retrieve the carrier-specified list of ERIs for home system

        log("isRoamIndForHomeSystem: " + mPhone.getContext().getResources()

        log("isRoamIndForHomeSystem: " + Resources.getSystem()

                .getConfiguration().toString());

        String[] homeRoamIndicators = mPhone.getContext().getResources()

        String[] homeRoamIndicators = Resources.getSystem()

                .getStringArray(com.android.internal.R.array.config_cdma_home_system);



        if (homeRoamIndicators != null) {