Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: c175a8ac85

Change-Id: I22680dfba0155e9cf8b6cad0b0aed8655930f2c0
This commit is contained in:
Shuo Qian
2018-12-28 13:24:00 -08:00
committed by android-build-merger
parent 65008ba65b c175a8ac85
commit e961a6f5f6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/TelephonyRegistry.java
View File

@@ -1696,7 +1696,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(