Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d311a1d6 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Catch CancellationException that can be thrown by Future 

Bug: 321295914
Test: monitor crash cluster
Change-Id: I7145c8f026b73767d2e0cb4623b4025b394ce947
parent 4881667c

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