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

Commit c9925a66 authored by Misha Wagner's avatar Misha Wagner Committed by Android (Google) Code Review
Browse files

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

parents 46931404 23d004ca

core/java/com/android/internal/os/KernelCpuThreadReader.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ import com.android.internal.util.ArrayUtils; 
import com.android.internal.util.Preconditions;

import com.android.internal.util.Preconditions;





import java.io.IOException;

import java.io.IOException;

import java.nio.file.DirectoryIteratorException;

import java.nio.file.DirectoryStream;

import java.nio.file.DirectoryStream;

import java.nio.file.Files;

import java.nio.file.Files;

import java.nio.file.Path;

import java.nio.file.Path;
@@ -276,7 +277,7 @@ public class KernelCpuThreadReader { 
                }

                }

                threadCpuUsages.add(threadCpuUsage);

                threadCpuUsages.add(threadCpuUsage);

            }

            }

        } catch (IOException e) {

        } catch (IOException | DirectoryIteratorException e) {

            // Expected when a process finishes

            // Expected when a process finishes

            return null;

            return null;

        }

        }