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

Commit e961a6f5 authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Merge "Do not use default to get TelephonyManager" am: 99f6957f 

am: c175a8ac

Change-Id: I22680dfba0155e9cf8b6cad0b0aed8655930f2c0
parents 65008ba6 c175a8ac

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

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



        synchronized (mRecords) {

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

            TelephonyManager tm = (TelephonyManager) mContext.getSystemService(

                    Context.TELEPHONY_SERVICE);

            mEmergencyNumberList = tm.getCurrentEmergencyNumberList();



            for (Record r : mRecords) {

                if (r.matchPhoneStateListenerEvent(