commit 3e66066440f2147cbfe28539f1c081c7f7566444
author Sudheer Shanka <sudheersai@google.com> Wed Feb 19 22:17:22 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 19 22:17:22 2020 +0000
tree b14425c185ae54bcaaeb1ff2a39746341e4b71b5
parent ed67786e6b16165bf1ecee602aa77c02b398f1ba
parent 9c7eed49fb27fedc271711de905549f0e106fb79

Merge "Don't error out if the index files are not available."

apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java

diff --git a/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java b/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java
index 1cc1c5f..977d8a0 100644
--- a/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java
+++ b/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java
@@ -491,6 +491,9 @@
         if (sessionsIndexFile == null) {
             Slog.wtf(TAG, "Error creating sessions index file");
             return;
+        } else if (!sessionsIndexFile.exists()) {
+            Slog.w(TAG, "Sessions index file not available: " + sessionsIndexFile.getBaseFile());
+            return;
         }
 
         mSessions.clear();
@@ -580,6 +583,9 @@
         if (blobsIndexFile == null) {
             Slog.wtf(TAG, "Error creating blobs index file");
             return;
+        } else if (!blobsIndexFile.exists()) {
+            Slog.w(TAG, "Blobs index file not available: " + blobsIndexFile.getBaseFile());
+            return;
         }
 
         mBlobsMap.clear();