Merge "StorageManager: Improve exception handling" am: cf3a4a68bd

am: 545cf37844

Change-Id: I452e3fcbda9cfa24db5b2bfdd077b7e5a7b241b4

1 files changed, 10 insertions, 2 deletions

diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index 2bc05655b55c..925288764562 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -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,10 +953,17 @@ 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;
-        }
+       }
     }
 
     /** @removed */