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

Commit 1c106c7d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Change-Id: I2d21cbe26eaa4ac72e1cd49ae4120911ec555238
parents c8cc71a0 a07da291

cmds/statsd/src/external/StatsPullerManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ const int64_t NO_ALARM_UPDATE = INT64_MAX; 
StatsPullerManager::StatsPullerManager()

    : kAllPullAtomInfo({

              // TrainInfo.

              {{.atomTag = util::TRAIN_INFO, .uid = -1}, new TrainInfoPuller()},

              {{.atomTag = util::TRAIN_INFO, .uid = AID_STATSD}, new TrainInfoPuller()},

      }),

      mNextPullTimeNs(NO_ALARM_UPDATE),

      mPullAtomCallbackDeathRecipient(AIBinder_DeathRecipient_new(pullAtomCallbackDied)) {

cmds/statsd/src/external/StatsPullerManager.h

+5 −5
Original line number Diff line number Diff line
@@ -101,11 +101,11 @@ public: 
    // 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.

    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.

    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.

    int ForceClearPullerCache();
@@ -118,9 +118,9 @@ public: 
    void RegisterPullAtomCallback(const int uid, const int32_t atomTag, const int64_t coolDownNs,

                                  const int64_t timeoutNs, const vector<int32_t>& additiveFields,

                                  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;
@@ -152,7 +152,7 @@ private: 
    std::map<ConfigKey, wp<PullUidProvider>> mPullUidProviders;



    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 useUids);