Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix merge isolated uid to host uid" into pi-dev

Browse Source 
am: 2abcea2b8a

Change-Id: Ib1f2929cea7ecc1345f78c3c2c1296cecfcc814b
This commit is contained in:
Chenjie Yu
2018-04-18 10:20:42 -07:00
committed by android-build-merger
parent 59cad0052d 2abcea2b8a
commit 4f01d03ed5
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cmds/statsd/src/external/puller_util.cpp vendored
View File

@@ -112,10 +112,13 @@ void mergeIsolatedUidsToHostUid(vector<shared_ptr<LogEvent>>& data, const sp<Uid
VLOG("Unknown pull atom id %d", tagId);
return;
}
if (android::util::AtomsInfo::kAtomsWithUidField.find(tagId) ==
android::util::AtomsInfo::kAtomsWithUidField.end()) {
int uidField;
auto it = android::util::AtomsInfo::kAtomsWithUidField.find(tagId);
if (it == android::util::AtomsInfo::kAtomsWithUidField.end()) {
VLOG("No uid to merge for atom %d", tagId);
return;
} else {
uidField = it->second; // uidField is the field number in proto,
}
const vector<int>& additiveFields =
StatsPullerManagerImpl::kAllPullAtomInfo.find(tagId)->second.additiveFields;
@@ -129,11 +132,13 @@ void mergeIsolatedUidsToHostUid(vector<shared_ptr<LogEvent>>& data, const sp<Uid
for (size_t i = 0; i < data.size(); i++) {
vector<FieldValue>* valueList = data[i]->getMutableValues();
int err = 0;
int uid = data[i]->GetInt(1, &err);
if (err != 0) {
VLOG("Bad uid field for %s", data[i]->ToString().c_str());
return;
int uid;
if (uidField > 0 && (int)data[i]->getValues().size() >= uidField &&
(data[i]->getValues())[uidField - 1].mValue.getType() == INT) {
uid = (*data[i]->getMutableValues())[uidField - 1].mValue.int_value;
} else {
ALOGE("Malformed log, uid not found. %s", data[i]->ToString().c_str());
continue;
}
const int hostUid = uidMap->getHostUidOrSelf(uid);