1 files changed, 10 insertions, 3 deletions
diff --git a/java/com/android/dialer/persistentlog/PersistentLogFileHandler.java b/java/com/android/dialer/persistentlog/PersistentLogFileHandler.java
index c113559a1..4ba5a72ec 100644
--- a/java/com/android/dialer/persistentlog/PersistentLogFileHandler.java
+++ b/java/com/android/dialer/persistentlog/PersistentLogFileHandler.java
@@ -51,7 +51,7 @@ import java.util.List;
  * worker thread.
  */
 @SuppressWarnings("AndroidApiChecker") // lambdas
-@TargetApi(VERSION_CODES.N)
+@TargetApi(VERSION_CODES.M)
 final class PersistentLogFileHandler {
 
   private static final String LOG_DIRECTORY = "persistent_log";
@@ -110,14 +110,21 @@ final class PersistentLogFileHandler {
   private byte[] readBlob() throws IOException {
     File[] files = getLogFiles();
 
-    ByteBuffer byteBuffer =
-        ByteBuffer.allocate(Arrays.stream(files).mapToInt(file -> (int) file.length()).sum());
+    ByteBuffer byteBuffer = ByteBuffer.allocate(getTotalSize(files));
     for (File file : files) {
       byteBuffer.put(readAllBytes(file));
     }
     return byteBuffer.array();
   }
 
+  private static final int getTotalSize(File[] files) {
+    int sum = 0;
+    for (File file : files) {
+      sum += file.length();
+    }
+    return sum;
+  }
+
   /** Parses the content of all files back to individual byte arrays. */
   @WorkerThread
   @NonNull