Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c4f7f8d authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Automerger Merge Worker
Browse files

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

Change-Id: I27c7e64fdeaa1dd64f7877ab7d77cefb7ec9f24e
parents 21b7490f afe0f89d

core/java/com/android/internal/os/BatteryStatsImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {

































services/core/java/com/android/server/am/BatteryStatsService.java



+1
−3




























Original line number
Diff line number
Diff line








@@ -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