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

Commit 7a06576a authored by Ruchir Rastogi's avatar Ruchir Rastogi Committed by Automerger Merge Worker
Browse files

Merge "Fix AppBreadcrumbReported bug with isolated uid" into rvc-dev am: 62a2b602 am: f7952e93 

Change-Id: I9f53531ebc0a7ac4b7acd5c7cb077ee8e10b9118
parents 58ca4fa3 f7952e93

cmds/statsd/src/metrics/MetricsManager.cpp

+8 −5
Original line number Original line Diff line number Diff line
@@ -391,7 +391,10 @@ bool MetricsManager::eventSanityCheck(const LogEvent& event) { 
            VLOG("APP_BREADCRUMB_REPORTED had error when parsing the uid");

            VLOG("APP_BREADCRUMB_REPORTED had error when parsing the uid");

            return false;

            return false;

        }

        }

        int32_t loggerUid = event.GetUid();



        // Because the uid within the LogEvent may have been mapped from

        // isolated to host, map the loggerUid similarly before comparing.

        int32_t loggerUid = mUidMap->getHostUidOrSelf(event.GetUid());

        if (loggerUid != appHookUid && loggerUid != AID_STATSD) {

        if (loggerUid != appHookUid && loggerUid != AID_STATSD) {

            VLOG("APP_BREADCRUMB_REPORTED has invalid uid: claimed %ld but caller is %d",

            VLOG("APP_BREADCRUMB_REPORTED has invalid uid: claimed %ld but caller is %d",

                 appHookUid, loggerUid);

                 appHookUid, loggerUid);