Merge "Fix directory iteration when path disappears." into rvc-dev

2020-03-18 16:21:14 +00:00
parent 4693140499 23d004ca7b
commit c9925a661c
1 changed files with 2 additions and 1 deletions
--- a/core/java/com/android/internal/os/KernelCpuThreadReader.java
+++ b/core/java/com/android/internal/os/KernelCpuThreadReader.java
@@ -25,6 +25,7 @@ import com.android.internal.util.ArrayUtils;
 import com.android.internal.util.Preconditions;

 import java.io.IOException;
+import java.nio.file.DirectoryIteratorException;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -276,7 +277,7 @@ public class KernelCpuThreadReader {
                }
                threadCpuUsages.add(threadCpuUsage);
            }
-        } catch (IOException e) {
+        } catch (IOException | DirectoryIteratorException e) {
            // Expected when a process finishes
            return null;
        }