From 55edd0c81c02b48f9ae69252a5f28935c69777b4 Mon Sep 17 00:00:00 2001
From: Dmitri Plotnikov <dplotnikov@google.com>
Date: Fri, 17 Apr 2020 16:02:40 -0700
Subject: [PATCH] Removing BatteryStatsImpl lock that causes a deadlock

Please see the original change I0d6b4a7b12b234939cb6eb3a32658b28f61dff4f,
where the additional locks were first introduced, but the original lock
was not consistently removed.

Bug: 153826721
Bug: 153813215
Test: Disable and reenable WiFi.

Change-Id: I0e68889e9dfe22495d64b16a495a83434b816304
---
 core/java/com/android/internal/os/BatteryStatsImpl.java       | 3 ++-
 .../core/java/com/android/server/am/BatteryStatsService.java  | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 43bd4a6109107..64324756796a3 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -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) {
diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java
index dbad562c02713..b647818e3f7ad 100644
--- a/services/core/java/com/android/server/am/BatteryStatsService.java
+++ b/services/core/java/com/android/server/am/BatteryStatsService.java
@@ -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