ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

metricsd: Use product id instead of build target id.

Browse source 
We decided to change the name of this identifier to "product id", the
system property where it is stored will also be named
ro.product.product_id.

BUG: 24302729

Change-Id: I0d2f0867b364de98367f0072d216acec76401c33
This commit is contained in:
Bertrand SIMONNET 2015-09-24 11:22:27 -07:00
parent cd27f8a198
commit 7beaf8924f
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
metricsd/constants.h
View file

@ -28,7 +28,7 @@ static const char kFailedUploadCountName[] = "failed_upload_count";
static const char kDefaultVersion[] = "0.0.0.0";
// System properties used.
static const char kBuildTargetIdProperty[] = "ro.product.build_target_id";
static const char kProductIdProperty[] = "ro.product.product_id";
static const char kChannelProperty[] = "ro.product.channel";
static const char kProductVersionProperty[] = "ro.product.version";
} // namespace metrics

8
metricsd/uploader/system_profile_cache.cc
View file

@ -73,10 +73,10 @@ bool SystemProfileCache::Initialize() {
CHECK(!initialized_)
<< "this should be called only once in the metrics_daemon lifetime.";
profile_.build_target_id = GetProperty(metrics::kBuildTargetIdProperty);
profile_.product_id = GetProperty(metrics::kProductIdProperty);
if (profile_.build_target_id.empty()) {
LOG(ERROR) << "System property " << metrics::kBuildTargetIdProperty
if (profile_.product_id.empty()) {
LOG(ERROR) << "System property " << metrics::kProductIdProperty
<< " is not set.";
return false;
}
@ -136,7 +136,7 @@ bool SystemProfileCache::Populate(
profile_proto->set_channel(profile_.channel);
metrics::SystemProfileProto_BrilloDeviceData* device_data =
profile_proto->mutable_brillo();
device_data->set_build_target_id(profile_.build_target_id);
device_data->set_build_target_id(profile_.product_id);
return true;
}

2
metricsd/uploader/system_profile_cache.h
View file

@ -39,7 +39,7 @@ struct SystemProfile {
std::string client_id;
int session_id;
metrics::SystemProfileProto::Channel channel;
std::string build_target_id;
std::string product_id;
};
// Retrieves general system informations needed by the protobuf for context and

4
metricsd/uploader/upload_service_test.cc
View file

@ -224,7 +224,7 @@ TEST_F(UploadServiceTest, ValuesInConfigFileAreSent) {
upload_service_->sender_.reset(sender);
SetTestingProperty(metrics::kChannelProperty, "beta");
SetTestingProperty(metrics::kBuildTargetIdProperty, "hello");
SetTestingProperty(metrics::kProductIdProperty, "hello");
SetTestingProperty(metrics::kProductVersionProperty, "1.2.3.4");
scoped_ptr<metrics::MetricSample> histogram =
@ -267,7 +267,7 @@ TEST_F(UploadServiceTest, PersistentGUID) {
}
TEST_F(UploadServiceTest, SessionIdIncrementedAtInitialization) {
SetTestingProperty(metrics::kBuildTargetIdProperty, "hello");
SetTestingProperty(metrics::kProductIdProperty, "hello");
SystemProfileCache cache(true, dir_.path());
cache.Initialize();
int session_id = cache.profile_.session_id;