Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: Iebe06129eeee62af8c21d0feea453e893da2d79e
Change-Id: I54e61243c88c7a4ac3d42d25ffad368b8396db32
diff --git a/assets/latest_carrier_id/carrier_list.pb b/assets/latest_carrier_id/carrier_list.pb
index 3ec929f..43c66e6 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 6619d50..da59056 100644
--- a/assets/latest_carrier_id/carrier_list.textpb
+++ b/assets/latest_carrier_id/carrier_list.textpb
@@ -3465,6 +3465,7 @@
canonical_id: 1480
carrier_name: "Telia"
carrier_attribute {
+ mccmnc_tuple: "24436"
mccmnc_tuple: "24491"
}
}
@@ -4705,9 +4706,14 @@
carrier_name: "NOS"
carrier_attribute {
mccmnc_tuple: "26803"
+ mccmnc_tuple: "26893"
mccmnc_tuple: "26897"
mccmnc_tuple: "26898"
mccmnc_tuple: "26899"
+ spn: "NOS"
+ spn: "WTF"
+ spn: "WOO"
+ spn: "GET"
}
}
carrier_id {
@@ -7856,7 +7862,9 @@
gid1: "554D"
gid1: "6132"
gid1: "6303"
+ gid1: "6903"
gid1: "756D"
+ gid1: "7601"
}
}
carrier_id {
@@ -8457,11 +8465,13 @@
carrier_name: "Visible"
carrier_attribute {
mccmnc_tuple: "311480"
+ mccmnc_tuple: "310590"
gid1: "bae1000000000000"
gid2: "1A00000000000000"
}
carrier_attribute {
mccmnc_tuple: "311480"
+ mccmnc_tuple: "310590"
gid1: "bae2000000000000"
gid2: "1C00000000000000"
}
@@ -10851,6 +10861,7 @@
carrier_name: "IZZI"
carrier_attribute {
mccmnc_tuple: "334140"
+ mccmnc_tuple: "334160"
spn: "izzi"
}
}
@@ -11592,7 +11603,7 @@
}
carrier_id {
canonical_id: 2575
- carrier_name: "MVNO"
+ carrier_name: "MVNx #T"
carrier_attribute {
mccmnc_tuple: "310280"
mccmnc_tuple: "310410"
@@ -12008,6 +12019,86 @@
}
}
carrier_id {
+ canonical_id: 2627
+ carrier_name: "Boost"
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ gid1: "6434"
+ }
+}
+carrier_id {
+ canonical_id: 2628
+ carrier_name: "AT&T Private"
+ carrier_attribute {
+ mccmnc_tuple: "310090"
+ mccmnc_tuple: "310280"
+ mccmnc_tuple: "310410"
+ mccmnc_tuple: "310950"
+ mccmnc_tuple: "311180"
+ gid1: "80FF"
+ }
+}
+carrier_id {
+ canonical_id: 2629
+ carrier_name: "Nova Labs, Inc."
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ mccmnc_tuple: "315010"
+ spn: "Helium"
+ gid1: "6907"
+ }
+}
+carrier_id {
+ canonical_id: 2630
+ carrier_name: "Nexphone"
+ carrier_attribute {
+ mccmnc_tuple: "22865"
+ spn: "Nexphone"
+ gid1: "4E657870686F6E65"
+ gid2: "4E657870686F6E6532303234"
+ }
+}
+carrier_id {
+ canonical_id: 2631
+ carrier_name: "Webbing"
+ carrier_attribute {
+ mccmnc_tuple: "20801"
+ mccmnc_tuple: "23410"
+ mccmnc_tuple: "42402"
+ mccmnc_tuple: "45400"
+ mccmnc_tuple: "45435"
+ mccmnc_tuple: "72454"
+ mccmnc_tuple: "90101"
+ mccmnc_tuple: "90131"
+ mccmnc_tuple: "311588"
+ mccmnc_tuple: "732101"
+ gid1: "536E617065"
+ }
+}
+carrier_id {
+ canonical_id: 2632
+ carrier_name: "Airbus FR"
+ carrier_attribute {
+ mccmnc_tuple: "208506"
+ }
+}
+carrier_id {
+ canonical_id: 2633
+ carrier_name: "Airbus DE"
+ carrier_attribute {
+ mccmnc_tuple: "26298"
+ spn: "Airbus"
+ }
+}
+carrier_id {
+ canonical_id: 2634
+ carrier_name: "NU"
+ carrier_attribute {
+ mccmnc_tuple: "72405"
+ gid1: "4E55FFFFFF"
+ }
+}
+carrier_id {
canonical_id: 10000
carrier_name: "Tracfone-ATT"
carrier_attribute {
@@ -12405,4 +12496,13 @@
}
parent_canonical_id: 2560
}
-version: 117440546
+carrier_id {
+ canonical_id: 10038
+ carrier_name: "Cricket 5G SA"
+ carrier_attribute {
+ mccmnc_tuple: "310150"
+ gid1: "52FF"
+ }
+ parent_canonical_id: 1779
+}
+version: 117440548
diff --git a/assets/sdk28_carrier_id/carrier_list.pb b/assets/sdk28_carrier_id/carrier_list.pb
index cc5493d..c7f7c77 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 287cc5f..290eea4 100644
--- a/assets/sdk28_carrier_id/carrier_list.textpb
+++ b/assets/sdk28_carrier_id/carrier_list.textpb
@@ -3856,6 +3856,9 @@
carrier_attribute {
mccmnc_tuple: "24491"
}
+ carrier_attribute {
+ mccmnc_tuple: "24436"
+ }
}
carrier_id {
canonical_id: 1481
@@ -5223,6 +5226,22 @@
carrier_attribute {
mccmnc_tuple: "26899"
}
+ carrier_attribute {
+ mccmnc_tuple: "26893"
+ spn: "NOS"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "26893"
+ spn: "WTF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "26893"
+ spn: "WOO"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "26893"
+ spn: "GET"
+ }
}
carrier_id {
canonical_id: 1669
@@ -8742,6 +8761,14 @@
mccmnc_tuple: "310240"
gid1: "756D"
}
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ gid1: "6903"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ gid1: "7601"
+ }
}
carrier_id {
canonical_id: 2086
@@ -11773,6 +11800,10 @@
mccmnc_tuple: "334140"
spn: "izzi"
}
+ carrier_attribute {
+ mccmnc_tuple: "334160"
+ spn: "izzi"
+ }
}
carrier_id {
canonical_id: 2489
@@ -12517,7 +12548,7 @@
}
carrier_id {
canonical_id: 2575
- carrier_name: "MVNO"
+ carrier_name: "MVNx #T"
carrier_attribute {
mccmnc_tuple: "310280"
gid1: "20FF"
@@ -13099,6 +13130,108 @@
}
}
carrier_id {
+ canonical_id: 2627
+ carrier_name: "Boost"
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ gid1: "6434"
+ }
+}
+carrier_id {
+ canonical_id: 2628
+ carrier_name: "AT&T Private"
+ carrier_attribute {
+ mccmnc_tuple: "310280"
+ gid1: "80FF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "310410"
+ gid1: "80FF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "310950"
+ gid1: "80FF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "311180"
+ gid1: "80FF"
+ }
+}
+carrier_id {
+ canonical_id: 2629
+ carrier_name: "Nova Labs, Inc."
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ spn: "Helium"
+ gid1: "6907"
+ }
+}
+carrier_id {
+ canonical_id: 2630
+ carrier_name: "Nexphone"
+ carrier_attribute {
+ mccmnc_tuple: "22865"
+ spn: "Nexphone"
+ gid1: "4E657870686F6E65"
+ gid2: "4E657870686F6E6532303234"
+ }
+}
+carrier_id {
+ canonical_id: 2631
+ carrier_name: "Webbing"
+ carrier_attribute {
+ mccmnc_tuple: "23410"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "42402"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "45435"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "90101"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "90131"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "311588"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "732101"
+ gid1: "536E617065"
+ }
+}
+carrier_id {
+ canonical_id: 2632
+ carrier_name: "Airbus FR"
+ carrier_attribute {
+ mccmnc_tuple: "208506"
+ }
+}
+carrier_id {
+ canonical_id: 2633
+ carrier_name: "Airbus DE"
+ carrier_attribute {
+ mccmnc_tuple: "26298"
+ spn: "Airbus"
+ }
+}
+carrier_id {
+ canonical_id: 2634
+ carrier_name: "NU"
+ carrier_attribute {
+ mccmnc_tuple: "72405"
+ gid1: "4E55FFFFFF"
+ }
+}
+carrier_id {
canonical_id: 10000
carrier_name: "Tracfone-ATT"
carrier_attribute {
@@ -13340,4 +13473,4 @@
}
parent_canonical_id: 2023
}
-version: 42
+version: 44
diff --git a/assets/sdk29_carrier_id/carrier_list.pb b/assets/sdk29_carrier_id/carrier_list.pb
index 7ae71bc..16eaeff 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 4831f31..246b9e2 100644
--- a/assets/sdk29_carrier_id/carrier_list.textpb
+++ b/assets/sdk29_carrier_id/carrier_list.textpb
@@ -3796,6 +3796,9 @@
carrier_attribute {
mccmnc_tuple: "24491"
}
+ carrier_attribute {
+ mccmnc_tuple: "24436"
+ }
}
carrier_id {
canonical_id: 1481
@@ -5062,6 +5065,22 @@
carrier_attribute {
mccmnc_tuple: "26899"
}
+ carrier_attribute {
+ mccmnc_tuple: "26893"
+ spn: "NOS"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "26893"
+ spn: "WTF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "26893"
+ spn: "WOO"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "26893"
+ spn: "GET"
+ }
}
carrier_id {
canonical_id: 1669
@@ -8481,6 +8500,14 @@
mccmnc_tuple: "310240"
gid1: "756D"
}
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ gid1: "6903"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ gid1: "7601"
+ }
}
carrier_id {
canonical_id: 2086
@@ -11589,6 +11616,10 @@
mccmnc_tuple: "334140"
spn: "izzi"
}
+ carrier_attribute {
+ mccmnc_tuple: "334160"
+ spn: "izzi"
+ }
}
carrier_id {
canonical_id: 2489
@@ -12357,7 +12388,7 @@
}
carrier_id {
canonical_id: 2575
- carrier_name: "MVNO"
+ carrier_name: "MVNx #T"
carrier_attribute {
mccmnc_tuple: "310280"
gid1: "20FF"
@@ -13013,6 +13044,104 @@
}
}
carrier_id {
+ canonical_id: 2627
+ carrier_name: "Boost"
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ gid1: "6434"
+ }
+}
+carrier_id {
+ canonical_id: 2628
+ carrier_name: "AT&T Private"
+ carrier_attribute {
+ mccmnc_tuple: "310280"
+ gid1: "80FF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "310410"
+ gid1: "80FF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "310950"
+ gid1: "80FF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "311180"
+ gid1: "80FF"
+ }
+}
+carrier_id {
+ canonical_id: 2629
+ carrier_name: "Nova Labs, Inc."
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ spn: "Helium"
+ gid1: "6907"
+ }
+}
+carrier_id {
+ canonical_id: 2630
+ carrier_name: "Nexphone"
+ carrier_attribute {
+ mccmnc_tuple: "22865"
+ spn: "Nexphone"
+ gid1: "4E657870686F6E65"
+ gid2: "4E657870686F6E6532303234"
+ }
+}
+carrier_id {
+ canonical_id: 2631
+ carrier_name: "Webbing"
+ carrier_attribute {
+ mccmnc_tuple: "42402"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "45435"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "90101"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "90131"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "311588"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "732101"
+ gid1: "536E617065"
+ }
+}
+carrier_id {
+ canonical_id: 2632
+ carrier_name: "Airbus FR"
+ carrier_attribute {
+ mccmnc_tuple: "208506"
+ }
+}
+carrier_id {
+ canonical_id: 2633
+ carrier_name: "Airbus DE"
+ carrier_attribute {
+ mccmnc_tuple: "26298"
+ spn: "Airbus"
+ }
+}
+carrier_id {
+ canonical_id: 2634
+ carrier_name: "NU"
+ carrier_attribute {
+ mccmnc_tuple: "72405"
+ gid1: "4E55FFFFFF"
+ }
+}
+carrier_id {
canonical_id: 10000
carrier_name: "Tracfone-ATT"
carrier_attribute {
@@ -13253,4 +13382,4 @@
}
parent_canonical_id: 2023
}
-version: 16777266
+version: 16777268
diff --git a/assets/sdk30_carrier_id/carrier_list.pb b/assets/sdk30_carrier_id/carrier_list.pb
index 2893b62..60ea26c 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 24c5ee2..cbb1b69 100644
--- a/assets/sdk30_carrier_id/carrier_list.textpb
+++ b/assets/sdk30_carrier_id/carrier_list.textpb
@@ -3797,6 +3797,9 @@
carrier_attribute {
mccmnc_tuple: "24491"
}
+ carrier_attribute {
+ mccmnc_tuple: "24436"
+ }
}
carrier_id {
canonical_id: 1481
@@ -5064,6 +5067,22 @@
carrier_attribute {
mccmnc_tuple: "26899"
}
+ carrier_attribute {
+ mccmnc_tuple: "26893"
+ spn: "NOS"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "26893"
+ spn: "WTF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "26893"
+ spn: "WOO"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "26893"
+ spn: "GET"
+ }
}
carrier_id {
canonical_id: 1669
@@ -8448,6 +8467,14 @@
mccmnc_tuple: "310240"
gid1: "756D"
}
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ gid1: "6903"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ gid1: "7601"
+ }
}
carrier_id {
canonical_id: 2086
@@ -11567,6 +11594,10 @@
mccmnc_tuple: "334140"
spn: "izzi"
}
+ carrier_attribute {
+ mccmnc_tuple: "334160"
+ spn: "izzi"
+ }
}
carrier_id {
canonical_id: 2489
@@ -12335,7 +12366,7 @@
}
carrier_id {
canonical_id: 2575
- carrier_name: "MVNO"
+ carrier_name: "MVNx #T"
carrier_attribute {
mccmnc_tuple: "310280"
gid1: "20FF"
@@ -12991,6 +13022,108 @@
}
}
carrier_id {
+ canonical_id: 2627
+ carrier_name: "Boost"
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ gid1: "6434"
+ }
+}
+carrier_id {
+ canonical_id: 2628
+ carrier_name: "AT&T Private"
+ carrier_attribute {
+ mccmnc_tuple: "310090"
+ gid1: "80FF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "310280"
+ gid1: "80FF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "310410"
+ gid1: "80FF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "310950"
+ gid1: "80FF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "311180"
+ gid1: "80FF"
+ }
+}
+carrier_id {
+ canonical_id: 2629
+ carrier_name: "Nova Labs, Inc."
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ spn: "Helium"
+ gid1: "6907"
+ }
+}
+carrier_id {
+ canonical_id: 2630
+ carrier_name: "Nexphone"
+ carrier_attribute {
+ mccmnc_tuple: "22865"
+ spn: "Nexphone"
+ gid1: "4E657870686F6E65"
+ gid2: "4E657870686F6E6532303234"
+ }
+}
+carrier_id {
+ canonical_id: 2631
+ carrier_name: "Webbing"
+ carrier_attribute {
+ mccmnc_tuple: "42402"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "45435"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "90101"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "90131"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "311588"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "732101"
+ gid1: "536E617065"
+ }
+}
+carrier_id {
+ canonical_id: 2632
+ carrier_name: "Airbus FR"
+ carrier_attribute {
+ mccmnc_tuple: "208506"
+ }
+}
+carrier_id {
+ canonical_id: 2633
+ carrier_name: "Airbus DE"
+ carrier_attribute {
+ mccmnc_tuple: "26298"
+ spn: "Airbus"
+ }
+}
+carrier_id {
+ canonical_id: 2634
+ carrier_name: "NU"
+ carrier_attribute {
+ mccmnc_tuple: "72405"
+ gid1: "4E55FFFFFF"
+ }
+}
+carrier_id {
canonical_id: 10000
carrier_name: "Tracfone-ATT"
carrier_attribute {
@@ -13251,4 +13384,4 @@
}
parent_canonical_id: 2023
}
-version: 33554500
+version: 33554502
diff --git a/assets/sdk31_carrier_id/carrier_list.pb b/assets/sdk31_carrier_id/carrier_list.pb
index cb59ab6..78a6358 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 391820c..587c75b 100644
--- a/assets/sdk31_carrier_id/carrier_list.textpb
+++ b/assets/sdk31_carrier_id/carrier_list.textpb
@@ -3534,6 +3534,9 @@
carrier_attribute {
mccmnc_tuple: "24491"
}
+ carrier_attribute {
+ mccmnc_tuple: "24436"
+ }
}
carrier_id {
canonical_id: 1481
@@ -4801,6 +4804,22 @@
carrier_attribute {
mccmnc_tuple: "26899"
}
+ carrier_attribute {
+ mccmnc_tuple: "26893"
+ spn: "NOS"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "26893"
+ spn: "WTF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "26893"
+ spn: "WOO"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "26893"
+ spn: "GET"
+ }
}
carrier_id {
canonical_id: 1669
@@ -8177,6 +8196,14 @@
mccmnc_tuple: "310240"
gid1: "756D"
}
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ gid1: "6903"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ gid1: "7601"
+ }
}
carrier_id {
canonical_id: 2086
@@ -8809,6 +8836,16 @@
mccmnc_tuple: "311480"
gid1: "bae2000000000000"
}
+ carrier_attribute {
+ mccmnc_tuple: "310590"
+ gid1: "bae1000000000000"
+ gid2: "1A00000000000000"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "310590"
+ gid1: "bae2000000000000"
+ gid2: "1C00000000000000"
+ }
}
carrier_id {
canonical_id: 2147
@@ -11241,6 +11278,10 @@
mccmnc_tuple: "334140"
spn: "izzi"
}
+ carrier_attribute {
+ mccmnc_tuple: "334160"
+ spn: "izzi"
+ }
}
carrier_id {
canonical_id: 2489
@@ -12020,7 +12061,7 @@
}
carrier_id {
canonical_id: 2575
- carrier_name: "MVNO"
+ carrier_name: "MVNx #T"
carrier_attribute {
mccmnc_tuple: "310280"
gid1: "20FF"
@@ -12680,6 +12721,112 @@
}
}
carrier_id {
+ canonical_id: 2627
+ carrier_name: "Boost"
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ gid1: "6434"
+ }
+}
+carrier_id {
+ canonical_id: 2628
+ carrier_name: "AT&T Private"
+ carrier_attribute {
+ mccmnc_tuple: "310090"
+ gid1: "80FF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "310280"
+ gid1: "80FF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "310410"
+ gid1: "80FF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "310950"
+ gid1: "80FF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "311180"
+ gid1: "80FF"
+ }
+}
+carrier_id {
+ canonical_id: 2629
+ carrier_name: "Nova Labs, Inc."
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ spn: "Helium"
+ gid1: "6907"
+ }
+}
+carrier_id {
+ canonical_id: 2630
+ carrier_name: "Nexphone"
+ carrier_attribute {
+ mccmnc_tuple: "22865"
+ spn: "Nexphone"
+ gid1: "4E657870686F6E65"
+ gid2: "4E657870686F6E6532303234"
+ }
+}
+carrier_id {
+ canonical_id: 2631
+ carrier_name: "Webbing"
+ carrier_attribute {
+ mccmnc_tuple: "42402"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "45435"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "72454"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "90101"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "90131"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "311588"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "732101"
+ gid1: "536E617065"
+ }
+}
+carrier_id {
+ canonical_id: 2632
+ carrier_name: "Airbus FR"
+ carrier_attribute {
+ mccmnc_tuple: "208506"
+ }
+}
+carrier_id {
+ canonical_id: 2633
+ carrier_name: "Airbus DE"
+ carrier_attribute {
+ mccmnc_tuple: "26298"
+ spn: "Airbus"
+ }
+}
+carrier_id {
+ canonical_id: 2634
+ carrier_name: "NU"
+ carrier_attribute {
+ mccmnc_tuple: "72405"
+ gid1: "4E55FFFFFF"
+ }
+}
+carrier_id {
canonical_id: 10000
carrier_name: "Tracfone-ATT"
carrier_attribute {
@@ -12980,4 +13127,4 @@
}
parent_canonical_id: 1894
}
-version: 50331692
+version: 50331694
diff --git a/assets/sdk33_carrier_id/carrier_list.pb b/assets/sdk33_carrier_id/carrier_list.pb
index cf92a59..f142039 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 ef7b5ab..6f79c83 100644
--- a/assets/sdk33_carrier_id/carrier_list.textpb
+++ b/assets/sdk33_carrier_id/carrier_list.textpb
@@ -3494,6 +3494,9 @@
carrier_attribute {
mccmnc_tuple: "24491"
}
+ carrier_attribute {
+ mccmnc_tuple: "24436"
+ }
}
carrier_id {
canonical_id: 1481
@@ -4744,6 +4747,22 @@
carrier_attribute {
mccmnc_tuple: "26899"
}
+ carrier_attribute {
+ mccmnc_tuple: "26893"
+ spn: "NOS"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "26893"
+ spn: "WTF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "26893"
+ spn: "WOO"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "26893"
+ spn: "GET"
+ }
}
carrier_id {
canonical_id: 1669
@@ -7967,6 +7986,14 @@
mccmnc_tuple: "310240"
gid1: "756D"
}
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ gid1: "6903"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ gid1: "7601"
+ }
}
carrier_id {
canonical_id: 2086
@@ -8574,6 +8601,16 @@
gid1: "bae2000000000000"
gid2: "1C00000000000000"
}
+ carrier_attribute {
+ mccmnc_tuple: "310590"
+ gid1: "bae1000000000000"
+ gid2: "1A00000000000000"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "310590"
+ gid1: "bae2000000000000"
+ gid2: "1C00000000000000"
+ }
}
carrier_id {
canonical_id: 2147
@@ -10962,6 +10999,10 @@
mccmnc_tuple: "334140"
spn: "izzi"
}
+ carrier_attribute {
+ mccmnc_tuple: "334160"
+ spn: "izzi"
+ }
}
carrier_id {
canonical_id: 2489
@@ -11715,7 +11756,7 @@
}
carrier_id {
canonical_id: 2575
- carrier_name: "MVNO"
+ carrier_name: "MVNx #T"
carrier_attribute {
mccmnc_tuple: "310280"
gid1: "20FF"
@@ -12415,6 +12456,117 @@
}
}
carrier_id {
+ canonical_id: 2627
+ carrier_name: "Boost"
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ gid1: "6434"
+ }
+}
+carrier_id {
+ canonical_id: 2628
+ carrier_name: "AT&T Private"
+ carrier_attribute {
+ mccmnc_tuple: "310090"
+ gid1: "80FF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "310280"
+ gid1: "80FF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "310410"
+ gid1: "80FF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "310950"
+ gid1: "80FF"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "311180"
+ gid1: "80FF"
+ }
+}
+carrier_id {
+ canonical_id: 2629
+ carrier_name: "Nova Labs, Inc."
+ carrier_attribute {
+ mccmnc_tuple: "310240"
+ spn: "Helium"
+ gid1: "6907"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "315010"
+ spn: "Helium"
+ gid1: "6907"
+ }
+}
+carrier_id {
+ canonical_id: 2630
+ carrier_name: "Nexphone"
+ carrier_attribute {
+ mccmnc_tuple: "22865"
+ spn: "Nexphone"
+ gid1: "4E657870686F6E65"
+ gid2: "4E657870686F6E6532303234"
+ }
+}
+carrier_id {
+ canonical_id: 2631
+ carrier_name: "Webbing"
+ carrier_attribute {
+ mccmnc_tuple: "42402"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "45435"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "72454"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "90101"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "90131"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "311588"
+ gid1: "536E617065"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "732101"
+ gid1: "536E617065"
+ }
+}
+carrier_id {
+ canonical_id: 2632
+ carrier_name: "Airbus FR"
+ carrier_attribute {
+ mccmnc_tuple: "208506"
+ }
+}
+carrier_id {
+ canonical_id: 2633
+ carrier_name: "Airbus DE"
+ carrier_attribute {
+ mccmnc_tuple: "26298"
+ spn: "Airbus"
+ }
+}
+carrier_id {
+ canonical_id: 2634
+ carrier_name: "NU"
+ carrier_attribute {
+ mccmnc_tuple: "72405"
+ gid1: "4E55FFFFFF"
+ }
+}
+carrier_id {
canonical_id: 10000
carrier_name: "Tracfone-ATT"
carrier_attribute {
@@ -12790,4 +12942,4 @@
}
parent_canonical_id: 2560
}
-version: 100663330
+version: 100663332
diff --git a/tests/Android.bp b/tests/Android.bp
index 78ffc5e..851d7a6 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -1,4 +1,5 @@
package {
+ default_team: "trendy_team_fwk_telephony",
// See: http://go/android-license-faq
default_applicable_licenses: ["Android-Apache-2.0"],
}
