Revert "Make ICUBinary.icuDataFiles immutable."

This reverts commit eab9abe11108315a75fcbd52d38bf6231b419a41.

Reason for revert: this is not needed.

Change-Id: I1983c73f0caed1866ab85d44d07de26014497c8d

2 files changed, 6 insertions, 24 deletions

diff --git a/android_icu4j/src/main/java/android/icu/impl/ICUBinary.java b/android_icu4j/src/main/java/android/icu/impl/ICUBinary.java
index 5e0c57f09..b1f9a7231 100644
--- a/android_icu4j/src/main/java/android/icu/impl/ICUBinary.java
+++ b/android_icu4j/src/main/java/android/icu/impl/ICUBinary.java
@@ -21,7 +21,6 @@ import java.nio.ByteOrder;
 import java.nio.channels.FileChannel;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.MissingResourceException;
 import java.util.Set;
@@ -284,8 +283,7 @@ public final class ICUBinary {
         }
     }
 
-    // Android-changed: make icuDataFiles immutable and assign value exactly once.
-    private static final List<DataFile> icuDataFiles;
+    private static final List<DataFile> icuDataFiles = new ArrayList<>();
 
     static {
         // BEGIN Android-changed: Initialize ICU data file paths.
@@ -299,15 +297,9 @@ public final class ICUBinary {
             dataPath = AndroidDataFiles.generateIcuDataPath();
         }
         // END Android-changed: Initialize ICU data file paths.
-        // BEGIN Android-changed: make icuDataFiles immutable and assign value exactly once.
         if (dataPath != null) {
-            List<DataFile> resolvedFiles = new ArrayList<>();
-            addDataFilesFromPath(dataPath, resolvedFiles);
-            icuDataFiles = Collections.unmodifiableList(resolvedFiles);
-        } else {
-            icuDataFiles = Collections.emptyList();
+            addDataFilesFromPath(dataPath, icuDataFiles);
         }
-        // END Android-changed: make icuDataFiles immutable and assign value exactly once.
     }
 
     private static void addDataFilesFromPath(String dataPath, List<DataFile> files) {
@@ -330,8 +322,7 @@ public final class ICUBinary {
                 path = path.substring(0, path.length() - 1);
             }
             if (path.length() != 0) {
-                // Android-changed: pass `files` argument and not icuDataFiles.
-                addDataFilesFromFolder(new File(path), new StringBuilder(), files);
+                addDataFilesFromFolder(new File(path), new StringBuilder(), icuDataFiles);
             }
             if (sepIndex < 0) {
                 break;
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/ICUBinary.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/ICUBinary.java
index 7e1d79e1c..bd4e8de89 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/ICUBinary.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/ICUBinary.java
@@ -20,7 +20,6 @@ import java.nio.ByteOrder;
 import java.nio.channels.FileChannel;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.MissingResourceException;
 import java.util.Set;
@@ -280,8 +279,7 @@ public final class ICUBinary {
         }
     }
 
-    // Android-changed: make icuDataFiles immutable and assign value exactly once.
-    private static final List<DataFile> icuDataFiles;
+    private static final List<DataFile> icuDataFiles = new ArrayList<>();
 
     static {
         // BEGIN Android-changed: Initialize ICU data file paths.
@@ -295,15 +293,9 @@ public final class ICUBinary {
             dataPath = AndroidDataFiles.generateIcuDataPath();
         }
         // END Android-changed: Initialize ICU data file paths.
-        // BEGIN Android-changed: make icuDataFiles immutable and assign value exactly once.
         if (dataPath != null) {
-            List<DataFile> resolvedFiles = new ArrayList<>();
-            addDataFilesFromPath(dataPath, resolvedFiles);
-            icuDataFiles = Collections.unmodifiableList(resolvedFiles);
-        } else {
-            icuDataFiles = Collections.emptyList();
+            addDataFilesFromPath(dataPath, icuDataFiles);
         }
-        // END Android-changed: make icuDataFiles immutable and assign value exactly once.
     }
 
     private static void addDataFilesFromPath(String dataPath, List<DataFile> files) {
@@ -326,8 +318,7 @@ public final class ICUBinary {
                 path = path.substring(0, path.length() - 1);
             }
             if (path.length() != 0) {
-                // Android-changed: pass `files` argument and not icuDataFiles.
-                addDataFilesFromFolder(new File(path), new StringBuilder(), files);
+                addDataFilesFromFolder(new File(path), new StringBuilder(), icuDataFiles);
             }
             if (sepIndex < 0) {
                 break;