shill: cellular: Update additiona_providers uuids to standard format.
After CL:198774 we use standard 128 bit uuids. This CL updates the additional
manually maintained providers to follow suit.
As a result, it updates the references to Verizon Wirless uuids in the cellular
code.
BUG=chromium:371179
TEST=Run shill_unittests.
Test verizon LTE activation.
Change-Id: Ic70ec4d7c04364f5790562b2a8d9ac2630a2c964
Reviewed-on: https://chromium-review.googlesource.com/198794
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Prathmesh Prabhu <pprabhu@chromium.org>
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
diff --git a/cellular_capability_universal.cc b/cellular_capability_universal.cc
index a1d2737..0249d13 100644
--- a/cellular_capability_universal.cc
+++ b/cellular_capability_universal.cc
@@ -75,7 +75,7 @@
const char kPhoneNumber[] = "*99#";
// This identifier is specified in the cellular_operator_info file.
-const char kVzwIdentifier[] = "vzw";
+const char kVzwIdentifier[] = "c83d6597-dc91-4d48-a3a7-d86b80123751";
const size_t kVzwMdnLength = 10;
string AccessTechnologyToString(uint32 access_technologies) {
diff --git a/cellular_capability_universal_cdma_unittest.cc b/cellular_capability_universal_cdma_unittest.cc
index acd6b50..905f58b 100644
--- a/cellular_capability_universal_cdma_unittest.cc
+++ b/cellular_capability_universal_cdma_unittest.cc
@@ -284,7 +284,7 @@
"POST",
"esn=${esn}&mdn=${mdn}&meid=${meid}"};
const vector<MobileOperatorInfo::OnlinePortal> kOlpList {kOlp};
- const string kUuidVzw = "vzw";
+ const string kUuidVzw = "c83d6597-dc91-4d48-a3a7-d86b80123751";
const string kUuidFoo = "foo";
SetMockMobileOperatorInfoObjects();
diff --git a/cellular_capability_universal_unittest.cc b/cellular_capability_universal_unittest.cc
index 2c2cc7f..0221ea0 100644
--- a/cellular_capability_universal_unittest.cc
+++ b/cellular_capability_universal_unittest.cc
@@ -1507,7 +1507,7 @@
}
TEST_F(CellularCapabilityUniversalMainTest, GetMdnForOLP) {
- const string kVzwUUID = "vzw";
+ const string kVzwUUID = "c83d6597-dc91-4d48-a3a7-d86b80123751";
const string kFooUUID = "foo";
MockMobileOperatorInfo mock_operator_info(&dispatcher_);
@@ -1550,7 +1550,7 @@
"POST",
"imei=${imei}&imsi=${imsi}&mdn=${mdn}&min=${min}&iccid=${iccid}"};
const vector<MobileOperatorInfo::OnlinePortal> kOlpList {kOlp};
- const string kUuidVzw = "vzw";
+ const string kUuidVzw = "c83d6597-dc91-4d48-a3a7-d86b80123751";
const string kUuidFoo = "foo";
cellular_->set_imei("1");
diff --git a/mobile_operator_db/additional_providers.prototxt b/mobile_operator_db/additional_providers.prototxt
index e0e1355..0a25370 100644
--- a/mobile_operator_db/additional_providers.prototxt
+++ b/mobile_operator_db/additional_providers.prototxt
@@ -26,7 +26,7 @@
#
mno {
data {
- uuid:"vzw"
+ uuid : "c83d6597-dc91-4d48-a3a7-d86b80123751"
country : "us"
localized_name {
name : "Verizon Wireless"
@@ -301,7 +301,7 @@
mno {
data {
- uuid : "mts"
+ uuid : "d9d788e1-7838-4167-aa96-d0926cb6ebad"
country : "in"
localized_name {
name : "MTS"
@@ -314,7 +314,7 @@
mno {
data {
- uuid : "tata"
+ uuid : "9f88594c-1dee-4e0e-9174-a6cc7e3c3569"
country : "in"
localized_name {
name : "Tata Docomo Photon"