diff options
| author | Dmitri Plotnikov <dplotnikov@google.com> | 2020-04-21 23:36:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-21 23:36:39 +0000 |
| commit | afe0f89d5923a6a4ebd24c087507fa59cefdd695 (patch) | |
| tree | 2cf7d5fe5f5469910ba5774fe831622765476df8 /core/java | |
| parent | bf517e48a209e564e272efb191f6f6a917b48fc8 (diff) | |
| parent | 55edd0c81c02b48f9ae69252a5f28935c69777b4 (diff) | |
Merge "Removing BatteryStatsImpl lock that causes a deadlock" into rvc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsImpl.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 43bd4a610910..64324756796a 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) { |