commit 060de35c28f0586d2f4145344c492bc9c90514b0
author Shuo Qian <shuoq@google.com> Fri Jun 04 13:49:41 2021 -0700
committer Shuo Qian <shuoq@google.com> Tue Jun 08 23:14:07 2021 +0000
tree 94c8d8278d55c39dd6dcd68b9d398376706335f8
parent f662348d7a0f2b62490dd7d8fdbadea44ffefed8

Integrate France emergency number in the database
Expand the MARINE_GUARD, MOUNTAIN_RESCUE, MIEC, AIEC services

Doc: https://docs.google.com/document/d/1sSJ4L2E2gBJbxoJZVi2Ici32YusNpg4cZ4hbaUFsKn0/edit?resourcekey=0-XJv2dH0lm3aKhH8MBD-GkQ

Test: atest EmergencyNumberTrackerTest
Bug: 156055946
Change-Id: Ib233448ada74e85dc5f4492fecbf675f0c3e9bdd
Merged-In: Ib233448ada74e85dc5f4492fecbf675f0c3e9bdd
(cherry picked from commit 67aa7bedfb7e08e931ae51fd87bf7f34cf392b94)

ecc/conversion_toolset_v1/proto/protobuf_ecc_data.proto

diff --git a/ecc/conversion_toolset_v1/proto/protobuf_ecc_data.proto b/ecc/conversion_toolset_v1/proto/protobuf_ecc_data.proto
index 5bd7bc3..c1a826a 100644
--- a/ecc/conversion_toolset_v1/proto/protobuf_ecc_data.proto
+++ b/ecc/conversion_toolset_v1/proto/protobuf_ecc_data.proto
@@ -13,6 +13,10 @@
         POLICE = 1;
         AMBULANCE = 2;
         FIRE = 3;
+        MARINE_GUARD = 4;
+        MOUNTAIN_RESCUE = 5;
+        MIEC = 6;
+        AIEC = 7;
     }
 
     // Required: Every EccInfo shall contain a phone number.

ecc/input/eccdata.txt

diff --git a/ecc/input/eccdata.txt b/ecc/input/eccdata.txt
index a674319..a8b021e 100644
--- a/ecc/input/eccdata.txt
+++ b/ecc/input/eccdata.txt
@@ -1,4 +1,4 @@
-revision: 1
+revision: 2
 countries {
   iso_code: "AD"
   eccs {
@@ -793,6 +793,54 @@
     types: AMBULANCE
     types: FIRE
   }
+  eccs {
+    phone_number: "15"
+    types: AMBULANCE
+  }
+  eccs {
+    phone_number: "17"
+    types: POLICE
+  }
+  eccs {
+    phone_number: "18"
+    types: FIRE
+  }
+  eccs {
+    phone_number: "115"
+    types: TYPE_UNSPECIFIED
+  }
+  eccs {
+    phone_number: "116000"
+    types: TYPE_UNSPECIFIED
+  }
+  eccs {
+    phone_number: "114"
+    types: TYPE_UNSPECIFIED
+  }
+  eccs {
+    phone_number: "191"
+    types: TYPE_UNSPECIFIED
+  }
+  eccs {
+    phone_number: "196"
+    types: MARINE_GUARD
+  }
+  eccs {
+    phone_number: "197"
+    types: TYPE_UNSPECIFIED
+  }
+  eccs {
+    phone_number: "116117"
+    types: TYPE_UNSPECIFIED
+  }
+  eccs {
+    phone_number: "116111"
+    types: TYPE_UNSPECIFIED
+  }
+  eccs {
+    phone_number: "119"
+    types: TYPE_UNSPECIFIED
+  }
   ecc_fallback: "112"
 }
 countries {

ecc/output/eccdata

diff --git a/ecc/output/eccdata b/ecc/output/eccdata
index 327e300..8427603 100644
--- a/ecc/output/eccdata
+++ b/ecc/output/eccdata
Binary files differ