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

Commit edca8aa3 authored by Alex Naidis's avatar Alex Naidis Committed by android-build-merger
Browse files

Merge "StorageManager: Improve exception handling" am: cf3a4a68 

am: 545cf378

Change-Id: I452e3fcbda9cfa24db5b2bfdd077b7e5a7b241b4
parents b9f1b72c 545cf378

core/java/android/os/storage/StorageManager.java

+10 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.internal.util.Preconditions; 
import java.io.BufferedReader;

import java.io.File;

import java.io.FileInputStream;

import java.io.FileNotFoundException;

import java.io.IOException;

import java.io.InputStreamReader;

import java.lang.ref.WeakReference;
@@ -952,8 +953,15 @@ public class StorageManager { 
        try (final FileInputStream fis = new FileInputStream(path);

                final BufferedReader reader = new BufferedReader(new InputStreamReader(fis));) {

            return Long.parseLong(reader.readLine());

        } catch (FileNotFoundException e) {

            // This is expected since we are trying to parse multiple paths.

            Slog.i(TAG, "readLong(): Path doesn't exist: " + path + ": " + e);

            return 0;

        } catch (NumberFormatException e) {

            Slog.e(TAG, "readLong(): Could not parse " + path + ": " + e);

            return 0;

        } catch (Exception e) {

            Slog.w(TAG, "readLong(): could not read " + path + ": " + e);

            Slog.e(TAG, "readLong(): Unknown exception while opening " + path + ": " + e);

            return 0;

       }

    }