Merge "Catch CancellationException that can be thrown by Future" into main (ac5b2d63) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -151,6 +151,7 @@ import java.util.List;
		import java.util.Map;
		import java.util.Objects;
		import java.util.Properties;
		import java.util.concurrent.CancellationException;
		import java.util.concurrent.CountDownLatch;
		import java.util.concurrent.ExecutionException;
		import java.util.concurrent.Future;
		@@ -653,7 +654,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub
		try {
		future.get();
		return;
		} catch (ExecutionException e) {
		} catch (ExecutionException \| CancellationException e) {
		return;
		} catch (InterruptedException e) {
		// Keep looping