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

Commit b136ea77 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:... 

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

Change-Id: I2fa39765ccb92a3b86fc909501db0b4fa98a706a
parents 0234295e f202431b

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -6093,7 +6093,8 @@ public class BatteryStatsImpl extends BatteryStats { 
        return array;

        return array;

    }

    }

















    public void noteNetworkInterfaceTypeLocked(String iface, int networkType) {







    /** @hide */














    public void noteNetworkInterfaceType(String iface, int networkType) {











        if (TextUtils.isEmpty(iface)) return;







        if (TextUtils.isEmpty(iface)) return;



























        synchronized (mModemNetworkLock) {







        synchronized (mModemNetworkLock) {

































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



+1
−3






























Original line number
Original line
Diff line number
Diff line








@@ -1013,9 +1013,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub









    @Override







    @Override











    public void noteNetworkInterfaceType(String iface, int networkType) {







    public void noteNetworkInterfaceType(String iface, int networkType) {











        enforceCallingPermission();







        enforceCallingPermission();











        synchronized (mStats) {







        mStats.noteNetworkInterfaceType(iface, networkType);











            mStats.noteNetworkInterfaceTypeLocked(iface, networkType);














        }














    }







    }































    @Override







    @Override