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

Merge "Turn on uid sandboxing" into rvc-dev am: a07da2913d

Browse Source 
Change-Id: Ie774545b8385c3736fea463b2ffd0df619d6329b
This commit is contained in:
TreeHugger Robot
2020-04-03 14:28:55 +00:00
committed by Automerger Merge Worker
parent bc712d51e3 a07da2913d
commit df5e84b1ea
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/statsd/src/external/StatsPullerManager.cpp vendored
View File

@@ -81,7 +81,7 @@ const int64_t NO_ALARM_UPDATE = INT64_MAX;
StatsPullerManager::StatsPullerManager() StatsPullerManager::StatsPullerManager()
: kAllPullAtomInfo({ : kAllPullAtomInfo({
// TrainInfo. // TrainInfo.
{{.atomTag = util::TRAIN_INFO, .uid = -1}, new TrainInfoPuller()}, {{.atomTag = util::TRAIN_INFO, .uid = AID_STATSD}, new TrainInfoPuller()},
}), }),
mNextPullTimeNs(NO_ALARM_UPDATE), mNextPullTimeNs(NO_ALARM_UPDATE),
mPullAtomCallbackDeathRecipient(AIBinder_DeathRecipient_new(pullAtomCallbackDied)) { mPullAtomCallbackDeathRecipient(AIBinder_DeathRecipient_new(pullAtomCallbackDied)) {

10
cmds/statsd/src/external/StatsPullerManager.h vendored
View File

@@ -101,11 +101,11 @@ public:
// If the metric wants to make any change to the data, like timestamps, they // If the metric wants to make any change to the data, like timestamps, they
// should make a copy as this data may be shared with multiple metrics. // should make a copy as this data may be shared with multiple metrics.
virtual bool Pull(int tagId, const ConfigKey& configKey, virtual bool Pull(int tagId, const ConfigKey& configKey,
vector<std::shared_ptr<LogEvent>>* data, bool useUids = false); vector<std::shared_ptr<LogEvent>>* data, bool useUids = true);
// Same as above, but directly specify the allowed uids to pull from. // Same as above, but directly specify the allowed uids to pull from.
virtual bool Pull(int tagId, const vector<int32_t>& uids, virtual bool Pull(int tagId, const vector<int32_t>& uids,
vector<std::shared_ptr<LogEvent>>* data, bool useUids = false); vector<std::shared_ptr<LogEvent>>* data, bool useUids = true);
// Clear pull data cache immediately. // Clear pull data cache immediately.
int ForceClearPullerCache(); int ForceClearPullerCache();
@@ -118,9 +118,9 @@ public:
void RegisterPullAtomCallback(const int uid, const int32_t atomTag, const int64_t coolDownNs, void RegisterPullAtomCallback(const int uid, const int32_t atomTag, const int64_t coolDownNs,
const int64_t timeoutNs, const vector<int32_t>& additiveFields, const int64_t timeoutNs, const vector<int32_t>& additiveFields,
const shared_ptr<IPullAtomCallback>& callback, const shared_ptr<IPullAtomCallback>& callback,
bool useUid = false); bool useUid = true);
void UnregisterPullAtomCallback(const int uid, const int32_t atomTag, bool useUids = false); void UnregisterPullAtomCallback(const int uid, const int32_t atomTag, bool useUids = true);
std::map<const PullerKey, sp<StatsPuller>> kAllPullAtomInfo; std::map<const PullerKey, sp<StatsPuller>> kAllPullAtomInfo;
@@ -152,7 +152,7 @@ private:
std::map<ConfigKey, wp<PullUidProvider>> mPullUidProviders; std::map<ConfigKey, wp<PullUidProvider>> mPullUidProviders;
bool PullLocked(int tagId, const ConfigKey& configKey, vector<std::shared_ptr<LogEvent>>* data, bool PullLocked(int tagId, const ConfigKey& configKey, vector<std::shared_ptr<LogEvent>>* data,
bool useUids = false); bool useUids = true);
bool PullLocked(int tagId, const vector<int32_t>& uids, vector<std::shared_ptr<LogEvent>>* data, bool PullLocked(int tagId, const vector<int32_t>& uids, vector<std::shared_ptr<LogEvent>>* data,
bool useUids); bool useUids);