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

Commit bab6908c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Statsd: ISOLATED_UID_CHANGED out of batterystats"

parents 3d3438ff 3c64886a

cmds/statsd/src/StatsLogProcessor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ void StatsLogProcessor::onIsolatedUidChangedEventLocked(const LogEvent& event) { 
        if (is_create) {

            mUidMap->assignIsolatedUid(isolated_uid, parent_uid);

        } else {

            mUidMap->removeIsolatedUid(isolated_uid, parent_uid);

            mUidMap->removeIsolatedUid(isolated_uid);

        }

    } else {

        ALOGE("Failed to parse uid in the isolated uid change event.");

cmds/statsd/src/atoms.proto

+1 −0
Original line number Diff line number Diff line
@@ -1484,6 +1484,7 @@ message ForegroundServiceStateChanged { 
message IsolatedUidChanged {

    // The host UID. Generally, we should attribute metrics from the isolated uid to the host uid.

    // NOTE: DO NOT annotate uid field in this atom. This atom is specially handled in statsd.

    // This field is ignored when event == REMOVED.

    optional int32 parent_uid = 1;



    optional int32 isolated_uid = 2;

cmds/statsd/src/packages/UidMap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ void UidMap::assignIsolatedUid(int isolatedUid, int parentUid) { 
    mIsolatedUidMap[isolatedUid] = parentUid;

}



void UidMap::removeIsolatedUid(int isolatedUid, int parentUid) {

void UidMap::removeIsolatedUid(int isolatedUid) {

    lock_guard<mutex> lock(mIsolatedMutex);



    auto it = mIsolatedUidMap.find(isolatedUid);

cmds/statsd/src/packages/UidMap.h

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ public: 
    void OnConfigRemoved(const ConfigKey& key);



    void assignIsolatedUid(int isolatedUid, int parentUid);

    void removeIsolatedUid(int isolatedUid, int parentUid);

    void removeIsolatedUid(int isolatedUid);



    // Returns the host uid if it exists. Otherwise, returns the same uid that was passed-in.

    virtual int getHostUidOrSelf(int uid) const;

core/java/com/android/internal/os/BatteryStatsImpl.java

+0 −5
Original line number Diff line number Diff line
@@ -4029,8 +4029,6 @@ public class BatteryStatsImpl extends BatteryStats { 














    public void addIsolatedUidLocked(int isolatedUid, int appUid) {















        mIsolatedUids.put(isolatedUid, appUid);













        StatsLog.write(StatsLog.ISOLATED_UID_CHANGED, appUid, isolatedUid,













                StatsLog.ISOLATED_UID_CHANGED__EVENT__CREATED);















        final Uid u = getUidStatsLocked(appUid);















        u.addIsolatedUid(isolatedUid);















    }









@@ -4054,9 +4052,6 @@ public class BatteryStatsImpl extends BatteryStats {













     */















    @GuardedBy("this")















    public void removeIsolatedUidLocked(int isolatedUid) {













        StatsLog.write(













                StatsLog.ISOLATED_UID_CHANGED, mIsolatedUids.get(isolatedUid, -1),













                isolatedUid, StatsLog.ISOLATED_UID_CHANGED__EVENT__REMOVED);















        final int idx = mIsolatedUids.indexOfKey(isolatedUid);















        if (idx >= 0) {















            final int ownerUid = mIsolatedUids.valueAt(idx);