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

Merge "Removing BatteryStatsImpl lock that causes a deadlock" into rvc-dev am: afe0f89d59

Browse Source 
Change-Id: Ic04a4abbbc9494ab8e380020e67fc0ac9a681be2
This commit is contained in:
Dmitri Plotnikov
2020-04-21 23:51:16 +00:00
committed by Automerger Merge Worker
parent 4a713a503a afe0f89d59
commit ac51802720
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@@ -6093,7 +6093,8 @@ public class BatteryStatsImpl extends BatteryStats {
return array;
}
public void noteNetworkInterfaceTypeLocked(String iface, int networkType) {
/** @hide */
public void noteNetworkInterfaceType(String iface, int networkType) {
if (TextUtils.isEmpty(iface)) return;
synchronized (mModemNetworkLock) {

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

@@ -1013,9 +1013,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub
@Override
public void noteNetworkInterfaceType(String iface, int networkType) {
enforceCallingPermission();
synchronized (mStats) {
mStats.noteNetworkInterfaceTypeLocked(iface, networkType);
}
mStats.noteNetworkInterfaceType(iface, networkType);
}
@Override