Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "StorageManager: Improve exception handling" am: cf3a4a68bd

Browse Source 
am: 545cf37844

Change-Id: I452e3fcbda9cfa24db5b2bfdd077b7e5a7b241b4
This commit is contained in:
Alex Naidis
2017-01-09 17:04:32 +00:00
committed by android-build-merger
parent b9f1b72cb3 545cf37844
commit edca8aa3a8
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/os/storage/StorageManager.java
View File

@@ -50,6 +50,7 @@ import com.android.internal.util.Preconditions;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
@@ -952,8 +953,15 @@ public class StorageManager {
try (final FileInputStream fis = new FileInputStream(path); try (final FileInputStream fis = new FileInputStream(path);
final BufferedReader reader = new BufferedReader(new InputStreamReader(fis));) { final BufferedReader reader = new BufferedReader(new InputStreamReader(fis));) {
return Long.parseLong(reader.readLine()); 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) { } catch (Exception e) {
Slog.w(TAG, "readLong(): could not read " + path + ": " + e); Slog.e(TAG, "readLong(): Unknown exception while opening " + path + ": " + e);
return 0; return 0;
} }
} }