commit 2a86a406c225c6cbd613de810a94ce1180dd71c4
author David Lin <dlinls@google.com> Mon Jun 03 02:28:54 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 03 02:28:54 2024 +0000
tree f494687385626c29fbc8da5165fcff2900e92ebc
parent 0dcecaf0cc9d05bf9213081ed66dad8030abc2c2
parent 78cbd98a4cf363a52ee627e0a173f0108df37781

Merge "Add attribution tag for bypassing location toggle" into 24D1-dev

ecc/input/eccdata.txt

diff --git a/ecc/input/eccdata.txt b/ecc/input/eccdata.txt
index 3248179..c4edc9e 100644
--- a/ecc/input/eccdata.txt
+++ b/ecc/input/eccdata.txt
@@ -208,17 +208,14 @@
   eccs {
     phone_number: "122"
     types: POLICE
-    routing: NORMAL
   }
   eccs {
     phone_number: "124"
     types: AMBULANCE
-    routing: NORMAL
   }
   eccs {
     phone_number: "123"
     types: FIRE
-    routing: NORMAL
   }
   ecc_fallback: "112"
 }
@@ -521,7 +518,7 @@
   eccs {
     phone_number: "117"
     types: POLICE
-    routing: NORMAL
+    routing: EMERGENCY
   }
   eccs {
     phone_number: "144"
@@ -551,7 +548,6 @@
   eccs {
     phone_number: "1414"
     types: TYPE_UNSPECIFIED
-    routing: NORMAL
   }
   eccs {
     phone_number: "0800117117"
@@ -1201,46 +1197,6 @@
     types: FIRE
     routing: NORMAL
   }
-  eccs {
-    phone_number: "115"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "116000"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "191"
-    types: MOUNTAIN_RESCUE
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "196"
-    types: MARINE_GUARD
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "197"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "116117"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "119"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "116111"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
   ecc_fallback: "112"
 }
 countries {
@@ -1411,12 +1367,10 @@
   eccs {
     phone_number: "101"
     types: AMBULANCE
-    routing: NORMAL
   }
   eccs {
     phone_number: "102"
     types: FIRE
-    routing: NORMAL
   }
   ecc_fallback: "112"
 }
@@ -1435,28 +1389,6 @@
     types: FIRE
     routing: NORMAL
   }
-  eccs {
-    phone_number: "101"
-    types: FIRE
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "102"
-    types: AMBULANCE
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "103"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "108"
-    types: POLICE
-    types: AMBULANCE
-    types: FIRE
-    routing: NORMAL
-  }
   ecc_fallback: "112"
 }
 countries {
@@ -2428,86 +2360,6 @@
     types: AMBULANCE
     types: FIRE
   }
-  eccs {
-    phone_number: "984"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-    normal_routing_mncs: "01"
-    normal_routing_mncs: "06"
-  }
-  eccs {
-    phone_number: "985"
-    types: MOUNTAIN_RESCUE
-    routing: NORMAL
-    normal_routing_mncs: "01"
-    normal_routing_mncs: "06"
-  }
-  eccs {
-    phone_number: "997"
-    types: POLICE
-    routing: NORMAL
-    normal_routing_mncs: "01"
-    normal_routing_mncs: "06"
-  }
-  eccs {
-    phone_number: "998"
-    types: FIRE
-    routing: NORMAL
-    normal_routing_mncs: "01"
-    normal_routing_mncs: "06"
-  }
-  eccs {
-    phone_number: "999"
-    types: AMBULANCE
-    routing: NORMAL
-    normal_routing_mncs: "01"
-    normal_routing_mncs: "06"
-  }
-  eccs {
-    phone_number: "986"
-    types: POLICE
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "987"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "989"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "991"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "992"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "993"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "994"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "995"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "996"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
   ecc_fallback: "112"
 }
 countries {
@@ -2618,46 +2470,6 @@
     types: FIRE
     routing: NORMAL
   }
-  eccs {
-    phone_number: "115"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "116000"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "191"
-    types: MOUNTAIN_RESCUE
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "196"
-    types: MARINE_GUARD
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "197"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "116117"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "119"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
-  eccs {
-    phone_number: "116111"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
   ecc_fallback: "112"
 }
 countries {
@@ -2816,7 +2628,6 @@
     phone_number: "995"
     types: AMBULANCE
     types: FIRE
-    routing: NORMAL
   }
   ecc_fallback: "112"
 }
@@ -2841,11 +2652,6 @@
     types: AMBULANCE
     types: FIRE
   }
-  eccs {
-    phone_number: "113"
-    types: POLICE
-    routing: NORMAL
-  }
   ecc_fallback: "112"
 }
 countries {
@@ -2856,11 +2662,6 @@
     types: AMBULANCE
     types: FIRE
   }
-  eccs {
-    phone_number: "159"
-    types: TYPE_UNSPECIFIED
-    routing: NORMAL
-  }
   ecc_fallback: "112"
 }
 countries {
@@ -3183,13 +2984,11 @@
   eccs {
     phone_number: "110"
     types: POLICE
-    routing: NORMAL
   }
   eccs {
     phone_number: "119"
     types: AMBULANCE
     types: FIRE
-    routing: NORMAL
   }
   ecc_fallback: "112"
 }

ecc/output/eccdata

diff --git a/ecc/output/eccdata b/ecc/output/eccdata
index b42de09..482ed79 100644
--- a/ecc/output/eccdata
+++ b/ecc/output/eccdata
Binary files differ