Merge "Do not use default to get TelephonyManager"

2018-12-28 20:59:16 +00:00
parent 8336204f99 3e8647c8ad
commit 99f6957f2e
1 changed files with 3 additions and 1 deletions
--- 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(