From 9c7eed49fb27fedc271711de905549f0e106fb79 Mon Sep 17 00:00:00 2001
From: Sudheer Shanka <sudheersai@google.com>
Date: Wed, 19 Feb 2020 11:45:59 -0800
Subject: [PATCH] Don't error out if the index files are not available.

... which is expected when there is no data contributed yet.

Test: atest --test-mapping apex/blobstore
Change-Id: Ib760a184fb17cb39d7d84378416c0e1fba390858
---
 .../com/android/server/blob/BlobStoreManagerService.java    | 6 ++++++
 1 file changed, 6 insertions(+)

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 d4ceabda8accc..8cd9f292e913f 100644
--- a/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java
+++ b/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java
@@ -485,6 +485,9 @@ public class BlobStoreManagerService extends SystemService {
         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();
@@ -574,6 +577,9 @@ public class BlobStoreManagerService extends SystemService {
         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();