Fix threading issue with PhoneNumberUtil.

Bug: 5354073
Change-Id: I6a37e714cc0587897f3bd9901cad730a91e2018f

1 files changed, 6 insertions, 3 deletions

diff --git a/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java b/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
index 2e1e9c8f..745fb7d1 100644
--- a/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
@@ -318,7 +318,8 @@ public class PhoneNumberUtil {
   private static PhoneNumberUtil instance = null;
 
   // A mapping from a region code to the PhoneMetadata for that region.
-  private Map<String, PhoneMetadata> regionToMetadataMap = new HashMap<String, PhoneMetadata>();
+  private final Map<String, PhoneMetadata> regionToMetadataMap =
+      Collections.synchronizedMap(new HashMap<String, PhoneMetadata>());
 
   // A cache for frequently used region-specific regular expressions.
   // As most people use phone numbers primarily from one to two countries, and there are roughly 60
@@ -1629,8 +1630,10 @@ public class PhoneNumberUtil {
     if (!isValidRegionCode(regionCode)) {
       return null;
     }
-    if (!regionToMetadataMap.containsKey(regionCode)) {
-      loadMetadataForRegionFromFile(currentFilePrefix, regionCode);
+    synchronized (regionToMetadataMap) {
+      if (!regionToMetadataMap.containsKey(regionCode)) {
+        loadMetadataForRegionFromFile(currentFilePrefix, regionCode);
+      }
     }
     return regionToMetadataMap.get(regionCode);
   }