Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc225c82 authored Nov 12, 2015 by Bertrand SIMONNET

metricsd: Fix the update channel parsing logic.

libupdate_engine_client returns the channel as "stable-channel",
"dev-channel" or "beta-channel". This CL updates the parsing logic to
match this format.

Bug: 25669566
Test: unit tests
Test: manual: The reported channel matches what update_engine_client
  --show_channel reports.

Change-Id: Ic6e52df892ae0b438f58fc05b178d5844d6674d0

parent 8591f719

metricsd/uploader/system_profile_cache.cc

+4 −4

Original line number	Diff line number	Diff line
		@@ -179,13 +179,13 @@ std::string SystemProfileCache::GetPersistentGUID(

		metrics::SystemProfileProto_Channel SystemProfileCache::ProtoChannelFromString(
		const std::string& channel) {
		if (channel == "stable") {
		if (channel == "stable-channel") {
		return metrics::SystemProfileProto::CHANNEL_STABLE;
		} else if (channel == "dev") {
		} else if (channel == "dev-channel") {
		return metrics::SystemProfileProto::CHANNEL_DEV;
		} else if (channel == "beta") {
		} else if (channel == "beta-channel") {
		return metrics::SystemProfileProto::CHANNEL_BETA;
		} else if (channel == "canary") {
		} else if (channel == "canary-channel") {
		return metrics::SystemProfileProto::CHANNEL_CANARY;
		}

metricsd/uploader/upload_service_test.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -214,10 +214,10 @@ TEST_F(UploadServiceTest, ExtractChannelFromString) {
		metrics::SystemProfileProto::CHANNEL_UNKNOWN);

		EXPECT_EQ(metrics::SystemProfileProto::CHANNEL_DEV,
		SystemProfileCache::ProtoChannelFromString("dev"));
		SystemProfileCache::ProtoChannelFromString("dev-channel"));

		EXPECT_EQ(metrics::SystemProfileProto::CHANNEL_STABLE,
		SystemProfileCache::ProtoChannelFromString("stable"));
		SystemProfileCache::ProtoChannelFromString("stable-channel"));

		EXPECT_EQ(metrics::SystemProfileProto::CHANNEL_UNKNOWN,
		SystemProfileCache::ProtoChannelFromString("this is a test"));