[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 6190ba7275 -s ours
am skip reason: Merged-In I3de9fcd3848285eb33588ed8986312b178b3236e with SHA-1 3898e98bc7 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/2993722
Change-Id: I881bc3754847226df3f45b17cd2933f96b23b74b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/assets/latest_carrier_id/carrier_list.pb b/assets/latest_carrier_id/carrier_list.pb
index 3ec929f..f116087 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..a71451f 100644
--- a/assets/latest_carrier_id/carrier_list.textpb
+++ b/assets/latest_carrier_id/carrier_list.textpb
@@ -7856,7 +7856,9 @@
gid1: "554D"
gid1: "6132"
gid1: "6303"
+ gid1: "6903"
gid1: "756D"
+ gid1: "7601"
}
}
carrier_id {
@@ -8457,11 +8459,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"
}
@@ -12008,6 +12012,46 @@
}
}
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: 10000
carrier_name: "Tracfone-ATT"
carrier_attribute {
@@ -12405,4 +12449,4 @@
}
parent_canonical_id: 2560
}
-version: 117440546
+version: 117440547
diff --git a/assets/sdk28_carrier_id/carrier_list.pb b/assets/sdk28_carrier_id/carrier_list.pb
index cc5493d..61f7174 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..e43cd38 100644
--- a/assets/sdk28_carrier_id/carrier_list.textpb
+++ b/assets/sdk28_carrier_id/carrier_list.textpb
@@ -8742,6 +8742,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
@@ -13099,6 +13107,53 @@
}
}
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: 10000
carrier_name: "Tracfone-ATT"
carrier_attribute {
@@ -13340,4 +13395,4 @@
}
parent_canonical_id: 2023
}
-version: 42
+version: 43
diff --git a/assets/sdk29_carrier_id/carrier_list.pb b/assets/sdk29_carrier_id/carrier_list.pb
index 7ae71bc..26bc66a 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..8db712d 100644
--- a/assets/sdk29_carrier_id/carrier_list.textpb
+++ b/assets/sdk29_carrier_id/carrier_list.textpb
@@ -8481,6 +8481,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
@@ -13013,6 +13021,53 @@
}
}
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: 10000
carrier_name: "Tracfone-ATT"
carrier_attribute {
@@ -13253,4 +13308,4 @@
}
parent_canonical_id: 2023
}
-version: 16777266
+version: 16777267
diff --git a/assets/sdk30_carrier_id/carrier_list.pb b/assets/sdk30_carrier_id/carrier_list.pb
index 2893b62..e1dae5b 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..555064b 100644
--- a/assets/sdk30_carrier_id/carrier_list.textpb
+++ b/assets/sdk30_carrier_id/carrier_list.textpb
@@ -8448,6 +8448,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
@@ -12991,6 +12999,57 @@
}
}
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: 10000
carrier_name: "Tracfone-ATT"
carrier_attribute {
@@ -13251,4 +13310,4 @@
}
parent_canonical_id: 2023
}
-version: 33554500
+version: 33554501
diff --git a/assets/sdk31_carrier_id/carrier_list.pb b/assets/sdk31_carrier_id/carrier_list.pb
index cb59ab6..ff57589 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..f6a4429 100644
--- a/assets/sdk31_carrier_id/carrier_list.textpb
+++ b/assets/sdk31_carrier_id/carrier_list.textpb
@@ -8177,6 +8177,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 +8817,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
@@ -12680,6 +12698,57 @@
}
}
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: 10000
carrier_name: "Tracfone-ATT"
carrier_attribute {
@@ -12980,4 +13049,4 @@
}
parent_canonical_id: 1894
}
-version: 50331692
+version: 50331693
diff --git a/assets/sdk33_carrier_id/carrier_list.pb b/assets/sdk33_carrier_id/carrier_list.pb
index cf92a59..9021753 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..3cdd182 100644
--- a/assets/sdk33_carrier_id/carrier_list.textpb
+++ b/assets/sdk33_carrier_id/carrier_list.textpb
@@ -7967,6 +7967,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 +8582,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
@@ -12415,6 +12433,62 @@
}
}
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: 10000
carrier_name: "Tracfone-ATT"
carrier_attribute {
@@ -12790,4 +12864,4 @@
}
parent_canonical_id: 2560
}
-version: 100663330
+version: 100663331
