[automerger skipped] Merge "DO NOT MERGE Block access to sms/mms db from work profile." into tm-dev am: 013b5b32d9 -s ours am: 816a276a3a -s ours am: f23d642895 -s ours am: 88c3ccff91 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/24527864
Change-Id: Ic133f69c778fef0f95746b6a09bd367055458936
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 b1b0112..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 63173d9..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"
}
@@ -2521,6 +2526,7 @@
carrier_name: "Telstra"
carrier_attribute {
mccmnc_tuple: "50501"
+ mccmnc_tuple: "50539"
mccmnc_tuple: "50571"
mccmnc_tuple: "50572"
}
@@ -3557,7 +3563,7 @@
}
carrier_id {
canonical_id: 1495
- carrier_name: "Colt Mobile Telecommunications Ltd"
+ carrier_name: "Spitfire Network Services Ltd"
carrier_attribute {
mccmnc_tuple: "23405"
}
@@ -4689,6 +4695,7 @@
carrier_name: "St. Pierre-et-Miquelon Télécom"
carrier_attribute {
mccmnc_tuple: "30801"
+ mccmnc_tuple: "30808"
}
}
carrier_id {
@@ -6417,7 +6424,6 @@
carrier_name: "COX"
carrier_attribute {
mccmnc_tuple: "311480"
- spn: "Cox Mobile"
gid1: "BA01570000000000"
gid2: "B100000000000000"
}
@@ -10953,6 +10959,7 @@
carrier_attribute {
mccmnc_tuple: "50501"
spn: "BOOST"
+ spn: "Boost"
}
}
carrier_id {
@@ -11061,6 +11068,7 @@
canonical_id: 2517
carrier_name: "Dish"
carrier_attribute {
+ mccmnc_tuple: "303220"
mccmnc_tuple: "313340"
gid1: "6530"
}
@@ -11069,6 +11077,7 @@
canonical_id: 2518
carrier_name: "Boost Mobile - MNO"
carrier_attribute {
+ mccmnc_tuple: "303220"
mccmnc_tuple: "313340"
gid1: "6332"
}
@@ -11507,8 +11516,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "302480017"
- spn: "SSi Mobile"
- gid1: "FF"
}
}
carrier_id {
@@ -11517,8 +11524,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "3024800002"
- spn: "Eeyou Mobility"
- gid1: "FF"
}
}
carrier_id {
@@ -11529,6 +11534,40 @@
}
}
carrier_id {
+ canonical_id: 2570
+ carrier_name: "Netcom Group"
+ carrier_attribute {
+ mccmnc_tuple: "20801"
+ spn: "Netcom Mobile"
+ spn: "Mobile O"
+ spn: "YouPrice O"
+ }
+}
+carrier_id {
+ canonical_id: 2571
+ carrier_name: "IZI"
+ carrier_attribute {
+ mccmnc_tuple: "43701"
+ imsi_prefix_xpattern: "437018"
+ }
+}
+carrier_id {
+ canonical_id: 2572
+ carrier_name: "Southern"
+ carrier_attribute {
+ mccmnc_tuple: "50501"
+ spn: "SOUTHERN"
+ }
+}
+carrier_id {
+ canonical_id: 2573
+ carrier_name: "Everyday"
+ carrier_attribute {
+ mccmnc_tuple: "50501"
+ spn: "Everyday"
+ }
+}
+carrier_id {
canonical_id: 10000
carrier_name: "Tracfone-ATT"
carrier_attribute {
@@ -11904,4 +11943,17 @@
}
parent_canonical_id: 2560
}
-version: 117440538
+carrier_id {
+ canonical_id: 10036
+ carrier_name: "Spectrum NaaS"
+ carrier_attribute {
+ mccmnc_tuple: "311480"
+ gid2: "A701490000000000"
+ }
+ carrier_attribute {
+ mccmnc_tuple: "311480"
+ gid2: "A701490000000001"
+ }
+ parent_canonical_id: 2126
+}
+version: 117440540
diff --git a/assets/sdk28_carrier_id/carrier_list.pb b/assets/sdk28_carrier_id/carrier_list.pb
index 57258ac..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 eba7e44..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"
}
@@ -2852,6 +2860,9 @@
mccmnc_tuple: "50571"
mccmnc_tuple: "50572"
}
+ carrier_attribute {
+ mccmnc_tuple: "50539"
+ }
}
carrier_id {
canonical_id: 1346
@@ -3921,7 +3932,7 @@
}
carrier_id {
canonical_id: 1495
- carrier_name: "Colt Mobile Telecommunications Ltd"
+ carrier_name: "Spitfire Network Services Ltd"
carrier_attribute {
mccmnc_tuple: "23405"
}
@@ -5169,6 +5180,9 @@
carrier_attribute {
mccmnc_tuple: "30801"
}
+ carrier_attribute {
+ mccmnc_tuple: "30808"
+ }
}
carrier_id {
canonical_id: 1668
@@ -6968,7 +6982,6 @@
}
carrier_attribute {
mccmnc_tuple: "311480"
- spn: "Cox Mobile"
gid1: "BA01570000000000"
gid2: "B100000000000000"
}
@@ -11771,6 +11784,10 @@
mccmnc_tuple: "50501"
spn: "BOOST"
}
+ carrier_attribute {
+ mccmnc_tuple: "50501"
+ spn: "Boost"
+ }
}
carrier_id {
canonical_id: 2504
@@ -11877,6 +11894,10 @@
carrier_attribute {
mccmnc_tuple: "313340"
}
+ carrier_attribute {
+ mccmnc_tuple: "303220"
+ gid1: "6530"
+ }
}
carrier_id {
canonical_id: 2518
@@ -11885,6 +11906,10 @@
mccmnc_tuple: "313340"
gid1: "6332"
}
+ carrier_attribute {
+ mccmnc_tuple: "303220"
+ gid1: "6332"
+ }
}
carrier_id {
canonical_id: 2519
@@ -12335,8 +12360,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "302480017"
- spn: "SSi Mobile"
- gid1: "FF"
}
}
carrier_id {
@@ -12345,8 +12368,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "3024800002"
- spn: "Eeyou Mobility"
- gid1: "FF"
}
}
carrier_id {
@@ -12357,6 +12378,30 @@
}
}
carrier_id {
+ canonical_id: 2571
+ carrier_name: "IZI"
+ carrier_attribute {
+ mccmnc_tuple: "43701"
+ imsi_prefix_xpattern: "437018"
+ }
+}
+carrier_id {
+ canonical_id: 2572
+ carrier_name: "Southern"
+ carrier_attribute {
+ mccmnc_tuple: "50501"
+ spn: "SOUTHERN"
+ }
+}
+carrier_id {
+ canonical_id: 2573
+ carrier_name: "Everyday"
+ carrier_attribute {
+ mccmnc_tuple: "50501"
+ spn: "Everyday"
+ }
+}
+carrier_id {
canonical_id: 10000
carrier_name: "Tracfone-ATT"
carrier_attribute {
@@ -12598,4 +12643,4 @@
}
parent_canonical_id: 2023
}
-version: 34
+version: 36
diff --git a/assets/sdk29_carrier_id/carrier_list.pb b/assets/sdk29_carrier_id/carrier_list.pb
index 83663df..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 d45c3cf..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"
}
@@ -2810,6 +2818,9 @@
mccmnc_tuple: "50571"
mccmnc_tuple: "50572"
}
+ carrier_attribute {
+ mccmnc_tuple: "50539"
+ }
}
carrier_id {
canonical_id: 1346
@@ -3861,7 +3872,7 @@
}
carrier_id {
canonical_id: 1495
- carrier_name: "Colt Mobile Telecommunications Ltd"
+ carrier_name: "Spitfire Network Services Ltd"
carrier_attribute {
mccmnc_tuple: "23405"
}
@@ -5008,6 +5019,9 @@
carrier_attribute {
mccmnc_tuple: "30801"
}
+ carrier_attribute {
+ mccmnc_tuple: "30808"
+ }
}
carrier_id {
canonical_id: 1668
@@ -6786,7 +6800,6 @@
}
carrier_attribute {
mccmnc_tuple: "311480"
- spn: "Cox Mobile"
gid1: "BA01570000000000"
gid2: "B100000000000000"
}
@@ -11587,6 +11600,10 @@
mccmnc_tuple: "50501"
spn: "BOOST"
}
+ carrier_attribute {
+ mccmnc_tuple: "50501"
+ spn: "Boost"
+ }
}
carrier_id {
canonical_id: 2504
@@ -11693,6 +11710,10 @@
carrier_attribute {
mccmnc_tuple: "313340"
}
+ carrier_attribute {
+ mccmnc_tuple: "303220"
+ gid1: "6530"
+ }
}
carrier_id {
canonical_id: 2518
@@ -11701,6 +11722,10 @@
mccmnc_tuple: "313340"
gid1: "6332"
}
+ carrier_attribute {
+ mccmnc_tuple: "303220"
+ gid1: "6332"
+ }
}
carrier_id {
canonical_id: 2519
@@ -12151,8 +12176,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "302480017"
- spn: "SSi Mobile"
- gid1: "FF"
}
}
carrier_id {
@@ -12161,8 +12184,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "3024800002"
- spn: "Eeyou Mobility"
- gid1: "FF"
}
}
carrier_id {
@@ -12173,6 +12194,30 @@
}
}
carrier_id {
+ canonical_id: 2571
+ carrier_name: "IZI"
+ carrier_attribute {
+ mccmnc_tuple: "43701"
+ imsi_prefix_xpattern: "437018"
+ }
+}
+carrier_id {
+ canonical_id: 2572
+ carrier_name: "Southern"
+ carrier_attribute {
+ mccmnc_tuple: "50501"
+ spn: "SOUTHERN"
+ }
+}
+carrier_id {
+ canonical_id: 2573
+ carrier_name: "Everyday"
+ carrier_attribute {
+ mccmnc_tuple: "50501"
+ spn: "Everyday"
+ }
+}
+carrier_id {
canonical_id: 10000
carrier_name: "Tracfone-ATT"
carrier_attribute {
@@ -12413,4 +12458,4 @@
}
parent_canonical_id: 2023
}
-version: 16777258
+version: 16777260
diff --git a/assets/sdk30_carrier_id/carrier_list.pb b/assets/sdk30_carrier_id/carrier_list.pb
index 5881668..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 f8e185c..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"
}
@@ -2819,6 +2827,9 @@
mccmnc_tuple: "50571"
mccmnc_tuple: "50572"
}
+ carrier_attribute {
+ mccmnc_tuple: "50539"
+ }
}
carrier_id {
canonical_id: 1346
@@ -3862,7 +3873,7 @@
}
carrier_id {
canonical_id: 1495
- carrier_name: "Colt Mobile Telecommunications Ltd"
+ carrier_name: "Spitfire Network Services Ltd"
carrier_attribute {
mccmnc_tuple: "23405"
}
@@ -5010,6 +5021,9 @@
carrier_attribute {
mccmnc_tuple: "30801"
}
+ carrier_attribute {
+ mccmnc_tuple: "30808"
+ }
}
carrier_id {
canonical_id: 1668
@@ -6783,7 +6797,6 @@
}
carrier_attribute {
mccmnc_tuple: "311480"
- spn: "Cox Mobile"
gid1: "BA01570000000000"
gid2: "B100000000000000"
}
@@ -11575,6 +11588,10 @@
mccmnc_tuple: "50501"
spn: "BOOST"
}
+ carrier_attribute {
+ mccmnc_tuple: "50501"
+ spn: "Boost"
+ }
}
carrier_id {
canonical_id: 2504
@@ -11681,6 +11698,10 @@
carrier_attribute {
mccmnc_tuple: "313340"
}
+ carrier_attribute {
+ mccmnc_tuple: "303220"
+ gid1: "6530"
+ }
}
carrier_id {
canonical_id: 2518
@@ -11689,6 +11710,10 @@
mccmnc_tuple: "313340"
gid1: "6332"
}
+ carrier_attribute {
+ mccmnc_tuple: "303220"
+ gid1: "6332"
+ }
}
carrier_id {
canonical_id: 2519
@@ -12139,8 +12164,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "302480017"
- spn: "SSi Mobile"
- gid1: "FF"
}
}
carrier_id {
@@ -12149,8 +12172,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "3024800002"
- spn: "Eeyou Mobility"
- gid1: "FF"
}
}
carrier_id {
@@ -12161,6 +12182,30 @@
}
}
carrier_id {
+ canonical_id: 2571
+ carrier_name: "IZI"
+ carrier_attribute {
+ mccmnc_tuple: "43701"
+ imsi_prefix_xpattern: "437018"
+ }
+}
+carrier_id {
+ canonical_id: 2572
+ carrier_name: "Southern"
+ carrier_attribute {
+ mccmnc_tuple: "50501"
+ spn: "SOUTHERN"
+ }
+}
+carrier_id {
+ canonical_id: 2573
+ carrier_name: "Everyday"
+ carrier_attribute {
+ mccmnc_tuple: "50501"
+ spn: "Everyday"
+ }
+}
+carrier_id {
canonical_id: 10000
carrier_name: "Tracfone-ATT"
carrier_attribute {
@@ -12421,4 +12466,4 @@
}
parent_canonical_id: 2023
}
-version: 33554492
+version: 33554494
diff --git a/assets/sdk31_carrier_id/carrier_list.pb b/assets/sdk31_carrier_id/carrier_list.pb
index ece4a3c..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 359ebef..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"
}
@@ -2564,6 +2572,9 @@
mccmnc_tuple: "50571"
mccmnc_tuple: "50572"
}
+ carrier_attribute {
+ mccmnc_tuple: "50539"
+ }
}
carrier_id {
canonical_id: 1346
@@ -3599,7 +3610,7 @@
}
carrier_id {
canonical_id: 1495
- carrier_name: "Colt Mobile Telecommunications Ltd"
+ carrier_name: "Spitfire Network Services Ltd"
carrier_attribute {
mccmnc_tuple: "23405"
}
@@ -4747,6 +4758,9 @@
carrier_attribute {
mccmnc_tuple: "30801"
}
+ carrier_attribute {
+ mccmnc_tuple: "30808"
+ }
}
carrier_id {
canonical_id: 1668
@@ -6515,7 +6529,6 @@
}
carrier_attribute {
mccmnc_tuple: "311480"
- spn: "Cox Mobile"
gid1: "BA01570000000000"
gid2: "B100000000000000"
}
@@ -11249,6 +11262,10 @@
mccmnc_tuple: "50501"
spn: "BOOST"
}
+ carrier_attribute {
+ mccmnc_tuple: "50501"
+ spn: "Boost"
+ }
}
carrier_id {
canonical_id: 2504
@@ -11359,6 +11376,10 @@
carrier_attribute {
mccmnc_tuple: "313340"
}
+ carrier_attribute {
+ mccmnc_tuple: "303220"
+ gid1: "6530"
+ }
}
carrier_id {
canonical_id: 2518
@@ -11367,6 +11388,10 @@
mccmnc_tuple: "313340"
gid1: "6332"
}
+ carrier_attribute {
+ mccmnc_tuple: "303220"
+ gid1: "6332"
+ }
}
carrier_id {
canonical_id: 2519
@@ -11824,8 +11849,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "302480017"
- spn: "SSi Mobile"
- gid1: "FF"
}
}
carrier_id {
@@ -11834,8 +11857,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "3024800002"
- spn: "Eeyou Mobility"
- gid1: "FF"
}
}
carrier_id {
@@ -11846,6 +11867,30 @@
}
}
carrier_id {
+ canonical_id: 2571
+ carrier_name: "IZI"
+ carrier_attribute {
+ mccmnc_tuple: "43701"
+ imsi_prefix_xpattern: "437018"
+ }
+}
+carrier_id {
+ canonical_id: 2572
+ carrier_name: "Southern"
+ carrier_attribute {
+ mccmnc_tuple: "50501"
+ spn: "SOUTHERN"
+ }
+}
+carrier_id {
+ canonical_id: 2573
+ carrier_name: "Everyday"
+ carrier_attribute {
+ mccmnc_tuple: "50501"
+ spn: "Everyday"
+ }
+}
+carrier_id {
canonical_id: 10000
carrier_name: "Tracfone-ATT"
carrier_attribute {
@@ -12146,4 +12191,4 @@
}
parent_canonical_id: 1894
}
-version: 50331684
+version: 50331686
diff --git a/assets/sdk33_carrier_id/carrier_list.pb b/assets/sdk33_carrier_id/carrier_list.pb
index f537693..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 bfb6359..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"
}
@@ -2524,6 +2532,9 @@
mccmnc_tuple: "50571"
mccmnc_tuple: "50572"
}
+ carrier_attribute {
+ mccmnc_tuple: "50539"
+ }
}
carrier_id {
canonical_id: 1346
@@ -3557,7 +3568,7 @@
}
carrier_id {
canonical_id: 1495
- carrier_name: "Colt Mobile Telecommunications Ltd"
+ carrier_name: "Spitfire Network Services Ltd"
carrier_attribute {
mccmnc_tuple: "23405"
}
@@ -4690,6 +4701,9 @@
carrier_attribute {
mccmnc_tuple: "30801"
}
+ carrier_attribute {
+ mccmnc_tuple: "30808"
+ }
}
carrier_id {
canonical_id: 1668
@@ -6423,7 +6437,6 @@
carrier_name: "COX"
carrier_attribute {
mccmnc_tuple: "311480"
- spn: "Cox Mobile"
gid1: "BA01570000000000"
gid2: "B100000000000000"
}
@@ -10960,6 +10973,10 @@
mccmnc_tuple: "50501"
spn: "BOOST"
}
+ carrier_attribute {
+ mccmnc_tuple: "50501"
+ spn: "Boost"
+ }
}
carrier_id {
canonical_id: 2504
@@ -11070,6 +11087,10 @@
mccmnc_tuple: "313340"
gid1: "6530"
}
+ carrier_attribute {
+ mccmnc_tuple: "303220"
+ gid1: "6530"
+ }
}
carrier_id {
canonical_id: 2518
@@ -11078,6 +11099,10 @@
mccmnc_tuple: "313340"
gid1: "6332"
}
+ carrier_attribute {
+ mccmnc_tuple: "303220"
+ gid1: "6332"
+ }
}
carrier_id {
canonical_id: 2519
@@ -11513,8 +11538,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "302480017"
- spn: "SSi Mobile"
- gid1: "FF"
}
}
carrier_id {
@@ -11523,8 +11546,6 @@
carrier_attribute {
mccmnc_tuple: "302480"
imsi_prefix_xpattern: "3024800002"
- spn: "Eeyou Mobility"
- gid1: "FF"
}
}
carrier_id {
@@ -11535,6 +11556,30 @@
}
}
carrier_id {
+ canonical_id: 2571
+ carrier_name: "IZI"
+ carrier_attribute {
+ mccmnc_tuple: "43701"
+ imsi_prefix_xpattern: "437018"
+ }
+}
+carrier_id {
+ canonical_id: 2572
+ carrier_name: "Southern"
+ carrier_attribute {
+ mccmnc_tuple: "50501"
+ spn: "SOUTHERN"
+ }
+}
+carrier_id {
+ canonical_id: 2573
+ carrier_name: "Everyday"
+ carrier_attribute {
+ mccmnc_tuple: "50501"
+ spn: "Everyday"
+ }
+}
+carrier_id {
canonical_id: 10000
carrier_name: "Tracfone-ATT"
carrier_attribute {
@@ -11910,4 +11955,4 @@
}
parent_canonical_id: 2560
}
-version: 100663322
+version: 100663324
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 1364afc..14ce6bb 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -3386,7 +3386,16 @@
android.Manifest.permission.MODIFY_PHONE_STATE, TAG);
final long identity = Binder.clearCallingIdentity();
try {
- restoreSimSpecificSettings(bundle, args);
+ Bundle resultBundle = new Bundle();
+ boolean changed = restoreSimSpecificSettings(bundle, args);
+ if (changed) {
+ mLocalLog.log("Restoration changed the subscription database.");
+ log("Restoration changed the subscription database.");
+ }
+ resultBundle.putBoolean(
+ SubscriptionManager.RESTORE_SIM_SPECIFIC_SETTINGS_DATABASE_UPDATED,
+ changed);
+ return resultBundle;
} finally {
Binder.restoreCallingIdentity(identity);
}
@@ -3416,19 +3425,21 @@
* data should already be in internal storage and will be retrieved from there.
* @param iccId of the SIM that a restore is being attempted for. If {@code null}, then try to
* restore for all simInfo entries in SimInfoDB
+ *
+ * @return {@code true} if the restoration changed the subscription database.
*/
- private void restoreSimSpecificSettings(@Nullable Bundle bundle, @Nullable String iccId) {
+ private boolean restoreSimSpecificSettings(@Nullable Bundle bundle, @Nullable String iccId) {
int restoreCase = TelephonyProtoEnums.SIM_RESTORE_CASE_UNDEFINED_USE_CASE;
if (bundle != null) {
restoreCase = TelephonyProtoEnums.SIM_RESTORE_CASE_SUW;
if (!writeSimSettingsToInternalStorage(
bundle.getByteArray(SubscriptionManager.KEY_SIM_SPECIFIC_SETTINGS_DATA))) {
- return;
+ return false;
}
} else if (iccId != null){
restoreCase = TelephonyProtoEnums.SIM_RESTORE_CASE_SIM_INSERTED;
}
- mergeBackedUpDataToSimInfoDb(restoreCase, iccId);
+ return mergeBackedUpDataToSimInfoDb(restoreCase, iccId);
}
@VisibleForTesting
@@ -3460,14 +3471,16 @@
* frameworks/proto_logging/stats/enums/telephony/enums.proto
* @param iccId of the SIM that a restore is being attempted for. If {@code null}, then try to
* restore for all simInfo entries in SimInfoDB
+ *
+ * @return {@code true} if the restoration changed the subscription database.
*/
- private void mergeBackedUpDataToSimInfoDb(int restoreCase, @Nullable String iccId) {
+ private boolean mergeBackedUpDataToSimInfoDb(int restoreCase, @Nullable String iccId) {
// Get data stored in internal file
File file = new File(getContext().getFilesDir(), BACKED_UP_SIM_SPECIFIC_SETTINGS_FILE);
if (!file.exists()) {
loge("internal sim-specific settings backup data file does not exist. "
+ "Aborting restore");
- return;
+ return false;
}
AtomicFile atomicFile = new AtomicFile(file);
@@ -3477,7 +3490,7 @@
} catch (IOException e) {
loge("Failed to convert backed up per-sim configs to bundle. Stopping restore. "
+ "Failed with error " + e);
- return;
+ return false;
}
String selection = null;
@@ -3497,13 +3510,23 @@
selection,
selectionArgs,
ORDER_BY_SUB_ID)) {
- findAndRestoreAllMatches(bundle.deepCopy(), cursor, restoreCase);
+ return findAndRestoreAllMatches(bundle.deepCopy(), cursor, restoreCase);
}
}
- // backedUpDataBundle must to be mutable
- private void findAndRestoreAllMatches(PersistableBundle backedUpDataBundle, Cursor cursor,
+ /**
+ * Find the matched subscription and restore SIM specific settings to them.
+ *
+ * @param backedUpDataBundle The backed-up data to be restored.
+ * @param cursor The database cursor.
+ * @param restoreCase one of the SimSpecificSettingsRestoreMatchingCriteria values defined in
+ * frameworks/proto_logging/stats/enums/telephony/enums.proto
+ *
+ * @return {@code true} if the restoration changed the subscription database.
+ */
+ private boolean findAndRestoreAllMatches(PersistableBundle backedUpDataBundle, Cursor cursor,
int restoreCase) {
+ boolean changed = false;
int[] previouslyRestoredSubIdsArray =
backedUpDataBundle.getIntArray(KEY_PREVIOUSLY_RESTORED_SUB_IDS);
List<Integer> previouslyRestoredSubIdsList = previouslyRestoredSubIdsArray != null
@@ -3582,20 +3605,31 @@
ContentValues newContentValues = bestRestoreMatch.getContentValues();
if (bestRestoreMatch.getMatchScore() != 0 && newContentValues != null) {
if (restoreCase == TelephonyProtoEnums.SIM_RESTORE_CASE_SUW) {
- update(SubscriptionManager.SIM_INFO_SUW_RESTORE_CONTENT_URI,
+ if (update(SubscriptionManager.SIM_INFO_SUW_RESTORE_CONTENT_URI,
newContentValues,
Telephony.SimInfo.COLUMN_UNIQUE_KEY_SUBSCRIPTION_ID + "=?",
- new String[]{Integer.toString(currSubIdFromDb)});
+ new String[]{Integer.toString(currSubIdFromDb)}) > 0) {
+ mLocalLog.log("Restored sub " + currSubIdFromDb + " from backup"
+ + ". case=SUW");
+ log("Restored sub " + currSubIdFromDb + " from backup. case=SUW");
+ changed = true;
+ }
} else if (restoreCase == TelephonyProtoEnums.SIM_RESTORE_CASE_SIM_INSERTED) {
Uri simInsertedRestoreUri = Uri.withAppendedPath(
SubscriptionManager.SIM_INFO_BACKUP_AND_RESTORE_CONTENT_URI,
SIM_INSERTED_RESTORE_URI_SUFFIX);
- update(simInsertedRestoreUri,
+ if (update(simInsertedRestoreUri,
newContentValues,
Telephony.SimInfo.COLUMN_UNIQUE_KEY_SUBSCRIPTION_ID + "=?",
- new String[]{Integer.toString(currSubIdFromDb)});
+ new String[]{Integer.toString(currSubIdFromDb)}) > 0) {
+ mLocalLog.log("Restored sub " + currSubIdFromDb + " from backup. "
+ + "case=SIM inserted.");
+ log("Restored sub " + currSubIdFromDb + " from backup. "
+ + "case=SIM inserted.");
+ changed = true;
+ }
}
- log("Restore of inserterd SIM's sim-specific settings has been successfully "
+ log("Restore of inserted SIM's sim-specific settings has been successfully "
+ "completed.");
TelephonyStatsLog.write(TelephonyStatsLog.SIM_SPECIFIC_SETTINGS_RESTORED,
TelephonyProtoEnums.SIM_RESTORE_RESULT_SUCCESS,
@@ -3629,6 +3663,7 @@
loge("Not able to convert SimInfoDB to byte array. Not storing which subIds were "
+ "restored");
}
+ return changed;
}
private static class SimRestoreMatch {
