commit | cc8e8c9ac6ced3fbcaad933c7116c91dd47b896c | [log] [tgz] |
---|---|---|
author | Sudheer Shanka <sudheersai@google.com> | Thu Sep 19 02:37:12 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 19 02:37:12 2024 +0000 |
tree | 6844732e3d6536c3cefb22683588b9ca02ee60a6 | |
parent | b1075ab0569e2e0ca19e377dbad88dc1024a33b6 [diff] | |
parent | d128efafec0c1a1d4cf7d2e1ba2d0a4ee5dafc78 [diff] |
Merge "[Bugfix] avoid deadlock caused by AppBatteryTracker.dump" into main am: 374f09ebb7 am: d128efafec Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3263912 Change-Id: Idd4e123d10a01826feb8e1d293a30c4957f7ae2a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>