From 3e8647c8add9b2c6110536345230238c6401d34c Mon Sep 17 00:00:00 2001 From: sqian Date: Fri, 14 Dec 2018 21:47:49 -0800 Subject: Do not use default to get TelephonyManager Bug: 112657134 Test: Manual Change-Id: I4ffe5e3284478a6337136dbc79ec5eed72013cc4 Merged-In: I4ffe5e3284478a6337136dbc79ec5eed72013cc4 (cherry picked from commit b0ae02b6464b3bd7f49ef68ae16ac0660ea169d9) --- services/core/java/com/android/server/TelephonyRegistry.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index 3bc63271b939..190e99f7b221 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -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( -- cgit v1.2.3-59-g8ed1b