From 4835023e37bbfb80c45e0194a22221aa9e935303 Mon Sep 17 00:00:00 2001
From: Jing Ji <jji@google.com>
Date: Mon, 21 Sep 2020 11:36:15 -0700
Subject: [PATCH] Don't hold the battery stats lock while waiting for
 completion

Bug: 169013495
Test: Manual

Change-Id: I40b53e5c22eba7e635febdf5b5fc4370c93fdf1d
---
 .../android/server/am/BatteryStatsService.java   | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java
index f42753287e35d..808a6993af1ab 100644
--- a/services/core/java/com/android/server/am/BatteryStatsService.java
+++ b/services/core/java/com/android/server/am/BatteryStatsService.java
@@ -276,15 +276,13 @@ public final class BatteryStatsService extends IBatteryStats.Stub
     }
 
     private void awaitCompletion() {
-        synchronized (mLock) {
-            final CountDownLatch latch = new CountDownLatch(1);
-            mHandler.post(() -> {
-                latch.countDown();
-            });
-            try {
-                latch.await();
-            } catch (InterruptedException e) {
-            }
+        final CountDownLatch latch = new CountDownLatch(1);
+        mHandler.post(() -> {
+            latch.countDown();
+        });
+        try {
+            latch.await();
+        } catch (InterruptedException e) {
         }
     }