commit 99f6957f2e42caeea209d2069174cab24c347a95
author Shuo Qian <shuoq@google.com> Fri Dec 28 20:59:16 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 28 20:59:16 2018 +0000
tree 047a29a4dcca57bfc7d01ab7cc10f1eab1f0927f
parent 8336204f999111f1177d53e0d6374a60cd1f1dca
parent 3e8647c8add9b2c6110536345230238c6401d34c

Merge "Do not use default to get TelephonyManager"

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

diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java
index 3bc6327..190e99f 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -1696,7 +1696,9 @@
         }
 
         synchronized (mRecords) {
-            mEmergencyNumberList = TelephonyManager.getDefault().getCurrentEmergencyNumberList();
+            TelephonyManager tm = (TelephonyManager) mContext.getSystemService(
+                    Context.TELEPHONY_SERVICE);
+            mEmergencyNumberList = tm.getCurrentEmergencyNumberList();
 
             for (Record r : mRecords) {
                 if (r.matchPhoneStateListenerEvent(