Merge cherrypicks of ['googleplex-android-review.googlesource.com/24393137'] into udc-d1-release.
Change-Id: I74674baf59179d09072ebe97615f6a482fd16e64
diff --git a/assets/latest_carrier_id/carrier_list.pb b/assets/latest_carrier_id/carrier_list.pb
index 2c48870..76441cf 100644
--- a/assets/latest_carrier_id/carrier_list.pb
+++ b/assets/latest_carrier_id/carrier_list.pb
Binary files differ
diff --git a/assets/latest_carrier_id/carrier_list.textpb b/assets/latest_carrier_id/carrier_list.textpb
index 430b3e2..75724b5 100644
--- a/assets/latest_carrier_id/carrier_list.textpb
+++ b/assets/latest_carrier_id/carrier_list.textpb
@@ -715,6 +715,11 @@
mccmnc_tuple: "302630"
mccmnc_tuple: "302640"
}
+ carrier_attribute {
+ mccmnc_tuple: "302690"
+ gid1: "41"
+ gid1: "43"
+ }
}
carrier_id {
canonical_id: 577
@@ -1102,7 +1107,7 @@
}
carrier_id {
canonical_id: 760
- carrier_name: "3HK/SUPREME"
+ carrier_name: "Hutchison HK"
carrier_attribute {
mccmnc_tuple: "45403"
}
@@ -4690,6 +4695,7 @@
carrier_name: "St. Pierre-et-Miquelon Télécom"
carrier_attribute {
mccmnc_tuple: "30801"
+ mccmnc_tuple: "30808"
}
}
carrier_id {
@@ -6418,7 +6424,6 @@
carrier_name: "COX"
carrier_attribute {
mccmnc_tuple: "311480"
- spn: "Cox Mobile"
gid1: "BA01570000000000"
gid2: "B100000000000000"
}
@@ -11063,6 +11068,7 @@
canonical_id: 2517
carrier_name: "Dish"
carrier_attribute {
+ mccmnc_tuple: "303220"
mccmnc_tuple: "313340"
gid1: "6530"
}
@@ -11071,6 +11077,7 @@
canonical_id: 2518
carrier_name: "Boost Mobile - MNO"
carrier_attribute {
+ mccmnc_tuple: "303220"
mccmnc_tuple: "313340"
gid1: "6332"
}
@@ -11509,8 +11516,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "302480017"
- spn: "SSi Mobile"
- gid1: "FF"
}
}
carrier_id {
@@ -11519,8 +11524,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "3024800002"
- spn: "Eeyou Mobility"
- gid1: "FF"
}
}
carrier_id {
@@ -11953,4 +11956,4 @@
}
parent_canonical_id: 2126
}
-version: 117440539
+version: 117440540
diff --git a/assets/sdk28_carrier_id/carrier_list.pb b/assets/sdk28_carrier_id/carrier_list.pb
index e7f7d9f..2ea25fe 100644
--- a/assets/sdk28_carrier_id/carrier_list.pb
+++ b/assets/sdk28_carrier_id/carrier_list.pb
Binary files differ
diff --git a/assets/sdk28_carrier_id/carrier_list.textpb b/assets/sdk28_carrier_id/carrier_list.textpb
index 29861a2..ca88667 100644
--- a/assets/sdk28_carrier_id/carrier_list.textpb
+++ b/assets/sdk28_carrier_id/carrier_list.textpb
@@ -1013,6 +1013,14 @@
mccmnc_tuple: "302630"
mccmnc_tuple: "302640"
}
+ carrier_attribute {
+ mccmnc_tuple: "302690"
+ gid1: "41"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "302690"
+ gid1: "43"
+ }
}
carrier_id {
canonical_id: 577
@@ -1389,7 +1397,7 @@
}
carrier_id {
canonical_id: 760
- carrier_name: "3HK/SUPREME"
+ carrier_name: "Hutchison HK"
carrier_attribute {
mccmnc_tuple: "45403"
}
@@ -5172,6 +5180,9 @@
carrier_attribute {
mccmnc_tuple: "30801"
}
+ carrier_attribute {
+ mccmnc_tuple: "30808"
+ }
}
carrier_id {
canonical_id: 1668
@@ -6971,7 +6982,6 @@
}
carrier_attribute {
mccmnc_tuple: "311480"
- spn: "Cox Mobile"
gid1: "BA01570000000000"
gid2: "B100000000000000"
}
@@ -11884,6 +11894,10 @@
carrier_attribute {
mccmnc_tuple: "313340"
}
+ carrier_attribute {
+ mccmnc_tuple: "303220"
+ gid1: "6530"
+ }
}
carrier_id {
canonical_id: 2518
@@ -11892,6 +11906,10 @@
mccmnc_tuple: "313340"
gid1: "6332"
}
+ carrier_attribute {
+ mccmnc_tuple: "303220"
+ gid1: "6332"
+ }
}
carrier_id {
canonical_id: 2519
@@ -12342,8 +12360,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "302480017"
- spn: "SSi Mobile"
- gid1: "FF"
}
}
carrier_id {
@@ -12352,8 +12368,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "3024800002"
- spn: "Eeyou Mobility"
- gid1: "FF"
}
}
carrier_id {
@@ -12629,4 +12643,4 @@
}
parent_canonical_id: 2023
}
-version: 35
+version: 36
diff --git a/assets/sdk29_carrier_id/carrier_list.pb b/assets/sdk29_carrier_id/carrier_list.pb
index b973d1b..aa68814 100644
--- a/assets/sdk29_carrier_id/carrier_list.pb
+++ b/assets/sdk29_carrier_id/carrier_list.pb
Binary files differ
diff --git a/assets/sdk29_carrier_id/carrier_list.textpb b/assets/sdk29_carrier_id/carrier_list.textpb
index 1f8b2cd..801e165 100644
--- a/assets/sdk29_carrier_id/carrier_list.textpb
+++ b/assets/sdk29_carrier_id/carrier_list.textpb
@@ -1001,6 +1001,14 @@
mccmnc_tuple: "302630"
mccmnc_tuple: "302640"
}
+ carrier_attribute {
+ mccmnc_tuple: "302690"
+ gid1: "41"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "302690"
+ gid1: "43"
+ }
}
carrier_id {
canonical_id: 577
@@ -1374,7 +1382,7 @@
}
carrier_id {
canonical_id: 760
- carrier_name: "3HK/SUPREME"
+ carrier_name: "Hutchison HK"
carrier_attribute {
mccmnc_tuple: "45403"
}
@@ -5011,6 +5019,9 @@
carrier_attribute {
mccmnc_tuple: "30801"
}
+ carrier_attribute {
+ mccmnc_tuple: "30808"
+ }
}
carrier_id {
canonical_id: 1668
@@ -6789,7 +6800,6 @@
}
carrier_attribute {
mccmnc_tuple: "311480"
- spn: "Cox Mobile"
gid1: "BA01570000000000"
gid2: "B100000000000000"
}
@@ -11700,6 +11710,10 @@
carrier_attribute {
mccmnc_tuple: "313340"
}
+ carrier_attribute {
+ mccmnc_tuple: "303220"
+ gid1: "6530"
+ }
}
carrier_id {
canonical_id: 2518
@@ -11708,6 +11722,10 @@
mccmnc_tuple: "313340"
gid1: "6332"
}
+ carrier_attribute {
+ mccmnc_tuple: "303220"
+ gid1: "6332"
+ }
}
carrier_id {
canonical_id: 2519
@@ -12158,8 +12176,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "302480017"
- spn: "SSi Mobile"
- gid1: "FF"
}
}
carrier_id {
@@ -12168,8 +12184,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "3024800002"
- spn: "Eeyou Mobility"
- gid1: "FF"
}
}
carrier_id {
@@ -12444,4 +12458,4 @@
}
parent_canonical_id: 2023
}
-version: 16777259
+version: 16777260
diff --git a/assets/sdk30_carrier_id/carrier_list.pb b/assets/sdk30_carrier_id/carrier_list.pb
index a4312c9..b171667 100644
--- a/assets/sdk30_carrier_id/carrier_list.pb
+++ b/assets/sdk30_carrier_id/carrier_list.pb
Binary files differ
diff --git a/assets/sdk30_carrier_id/carrier_list.textpb b/assets/sdk30_carrier_id/carrier_list.textpb
index a32124c..91695e6 100644
--- a/assets/sdk30_carrier_id/carrier_list.textpb
+++ b/assets/sdk30_carrier_id/carrier_list.textpb
@@ -1001,6 +1001,14 @@
mccmnc_tuple: "302630"
mccmnc_tuple: "302640"
}
+ carrier_attribute {
+ mccmnc_tuple: "302690"
+ gid1: "41"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "302690"
+ gid1: "43"
+ }
}
carrier_id {
canonical_id: 577
@@ -1379,7 +1387,7 @@
}
carrier_id {
canonical_id: 760
- carrier_name: "3HK/SUPREME"
+ carrier_name: "Hutchison HK"
carrier_attribute {
mccmnc_tuple: "45403"
}
@@ -5013,6 +5021,9 @@
carrier_attribute {
mccmnc_tuple: "30801"
}
+ carrier_attribute {
+ mccmnc_tuple: "30808"
+ }
}
carrier_id {
canonical_id: 1668
@@ -6786,7 +6797,6 @@
}
carrier_attribute {
mccmnc_tuple: "311480"
- spn: "Cox Mobile"
gid1: "BA01570000000000"
gid2: "B100000000000000"
}
@@ -11688,6 +11698,10 @@
carrier_attribute {
mccmnc_tuple: "313340"
}
+ carrier_attribute {
+ mccmnc_tuple: "303220"
+ gid1: "6530"
+ }
}
carrier_id {
canonical_id: 2518
@@ -11696,6 +11710,10 @@
mccmnc_tuple: "313340"
gid1: "6332"
}
+ carrier_attribute {
+ mccmnc_tuple: "303220"
+ gid1: "6332"
+ }
}
carrier_id {
canonical_id: 2519
@@ -12146,8 +12164,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "302480017"
- spn: "SSi Mobile"
- gid1: "FF"
}
}
carrier_id {
@@ -12156,8 +12172,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "3024800002"
- spn: "Eeyou Mobility"
- gid1: "FF"
}
}
carrier_id {
@@ -12452,4 +12466,4 @@
}
parent_canonical_id: 2023
}
-version: 33554493
+version: 33554494
diff --git a/assets/sdk31_carrier_id/carrier_list.pb b/assets/sdk31_carrier_id/carrier_list.pb
index aa6cc6c..da6c4c3 100644
--- a/assets/sdk31_carrier_id/carrier_list.pb
+++ b/assets/sdk31_carrier_id/carrier_list.pb
Binary files differ
diff --git a/assets/sdk31_carrier_id/carrier_list.textpb b/assets/sdk31_carrier_id/carrier_list.textpb
index 464e0ce..3f66eab 100644
--- a/assets/sdk31_carrier_id/carrier_list.textpb
+++ b/assets/sdk31_carrier_id/carrier_list.textpb
@@ -771,6 +771,14 @@
mccmnc_tuple: "302630"
mccmnc_tuple: "302640"
}
+ carrier_attribute {
+ mccmnc_tuple: "302690"
+ gid1: "41"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "302690"
+ gid1: "43"
+ }
}
carrier_id {
canonical_id: 577
@@ -1140,7 +1148,7 @@
}
carrier_id {
canonical_id: 760
- carrier_name: "3HK/SUPREME"
+ carrier_name: "Hutchison HK"
carrier_attribute {
mccmnc_tuple: "45403"
}
@@ -4750,6 +4758,9 @@
carrier_attribute {
mccmnc_tuple: "30801"
}
+ carrier_attribute {
+ mccmnc_tuple: "30808"
+ }
}
carrier_id {
canonical_id: 1668
@@ -6518,7 +6529,6 @@
}
carrier_attribute {
mccmnc_tuple: "311480"
- spn: "Cox Mobile"
gid1: "BA01570000000000"
gid2: "B100000000000000"
}
@@ -11366,6 +11376,10 @@
carrier_attribute {
mccmnc_tuple: "313340"
}
+ carrier_attribute {
+ mccmnc_tuple: "303220"
+ gid1: "6530"
+ }
}
carrier_id {
canonical_id: 2518
@@ -11374,6 +11388,10 @@
mccmnc_tuple: "313340"
gid1: "6332"
}
+ carrier_attribute {
+ mccmnc_tuple: "303220"
+ gid1: "6332"
+ }
}
carrier_id {
canonical_id: 2519
@@ -11831,8 +11849,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "302480017"
- spn: "SSi Mobile"
- gid1: "FF"
}
}
carrier_id {
@@ -11841,8 +11857,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "3024800002"
- spn: "Eeyou Mobility"
- gid1: "FF"
}
}
carrier_id {
@@ -12177,4 +12191,4 @@
}
parent_canonical_id: 1894
}
-version: 50331685
+version: 50331686
diff --git a/assets/sdk33_carrier_id/carrier_list.pb b/assets/sdk33_carrier_id/carrier_list.pb
index 8acb887..ec0e0fd 100644
--- a/assets/sdk33_carrier_id/carrier_list.pb
+++ b/assets/sdk33_carrier_id/carrier_list.pb
Binary files differ
diff --git a/assets/sdk33_carrier_id/carrier_list.textpb b/assets/sdk33_carrier_id/carrier_list.textpb
index e71b0ec..148b6c3 100644
--- a/assets/sdk33_carrier_id/carrier_list.textpb
+++ b/assets/sdk33_carrier_id/carrier_list.textpb
@@ -715,6 +715,14 @@
mccmnc_tuple: "302630"
mccmnc_tuple: "302640"
}
+ carrier_attribute {
+ mccmnc_tuple: "302690"
+ gid1: "41"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "302690"
+ gid1: "43"
+ }
}
carrier_id {
canonical_id: 577
@@ -1102,7 +1110,7 @@
}
carrier_id {
canonical_id: 760
- carrier_name: "3HK/SUPREME"
+ carrier_name: "Hutchison HK"
carrier_attribute {
mccmnc_tuple: "45403"
}
@@ -4693,6 +4701,9 @@
carrier_attribute {
mccmnc_tuple: "30801"
}
+ carrier_attribute {
+ mccmnc_tuple: "30808"
+ }
}
carrier_id {
canonical_id: 1668
@@ -6426,7 +6437,6 @@
carrier_name: "COX"
carrier_attribute {
mccmnc_tuple: "311480"
- spn: "Cox Mobile"
gid1: "BA01570000000000"
gid2: "B100000000000000"
}
@@ -11077,6 +11087,10 @@
mccmnc_tuple: "313340"
gid1: "6530"
}
+ carrier_attribute {
+ mccmnc_tuple: "303220"
+ gid1: "6530"
+ }
}
carrier_id {
canonical_id: 2518
@@ -11085,6 +11099,10 @@
mccmnc_tuple: "313340"
gid1: "6332"
}
+ carrier_attribute {
+ mccmnc_tuple: "303220"
+ gid1: "6332"
+ }
}
carrier_id {
canonical_id: 2519
@@ -11520,8 +11538,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "302480017"
- spn: "SSi Mobile"
- gid1: "FF"
}
}
carrier_id {
@@ -11530,8 +11546,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "3024800002"
- spn: "Eeyou Mobility"
- gid1: "FF"
}
}
carrier_id {
@@ -11941,4 +11955,4 @@
}
parent_canonical_id: 2560
}
-version: 100663323
+version: 100663324
