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

Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs"

Browse Source 
am: 1dc2a0d77b

Change-Id: I9cb30ad45ec6f013a0944a923c3cc950a2d319fe
This commit is contained in:
Jayachandran Chinnakkannu
2019-11-18 13:49:27 -08:00
committed by android-build-merger
parent 42d7faea52 1dc2a0d77b
commit 7798357a86
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/BatteryExternalStatsWorker.java
View File

@@ -445,7 +445,7 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync {
if ((updateFlags & BatteryStatsImpl.ExternalStatsSync.UPDATE_RADIO) != 0) {
// We were asked to fetch Telephony data.
if (mTelephony == null) {
mTelephony = TelephonyManager.from(mContext);
mTelephony = mContext.getSystemService(TelephonyManager.class);
}
if (mTelephony != null) {

2
services/core/java/com/android/server/am/BatteryStatsService.java
View File

@@ -731,7 +731,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub
public void notePhoneState(int state) {
enforceCallingPermission();
int simState = TelephonyManager.getDefault().getSimState();
int simState = mContext.getSystemService(TelephonyManager.class).getSimState();
synchronized (mStats) {
mStats.notePhoneStateLocked(state, simState);
}