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

Commit 99da4542 authored by Shuo Qian's avatar Shuo Qian Committed by Android (Google) Code Review
Browse files

Merge "Do not use default to get TelephonyManager"

parents 74f1ce3f b0ae02b6

services/core/java/com/android/server/TelephonyRegistry.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -1684,7 +1684,9 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        }

        }





        synchronized (mRecords) {

        synchronized (mRecords) {

            mEmergencyNumberList = TelephonyManager.getDefault().getCurrentEmergencyNumberList();

            TelephonyManager tm = (TelephonyManager) mContext.getSystemService(

                    Context.TELEPHONY_SERVICE);

            mEmergencyNumberList = tm.getCurrentEmergencyNumberList();





            for (Record r : mRecords) {

            for (Record r : mRecords) {

                if (r.matchPhoneStateListenerEvent(

                if (r.matchPhoneStateListenerEvent(