Commit e5ec5142 authored May 05, 2023 by Treehugger Robot Committed by Automerger Merge Worker May 05, 2023

Merge "Fixes a thread safety issue (a time-of-check-time-of-use bug) in...

Merge "Fixes a thread safety issue (a time-of-check-time-of-use bug) in BatteryExternalStatsWorker that causes system_server crashes in VROS device." am: 75a97e48

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2576760

Change-Id: Idbe26af9bb631ac78b098821e00778f9c2d21a13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -399,7 +399,7 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync {
		}
		}

		public void shutdown() {
		public synchronized void shutdown() {
		mExecutorService.shutdownNow();
		}