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

Commit 4e2eeffb authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Update to support long version codes. 

Bug: 64459786
Test: manual
Change-Id: I8b251f5238d6aeed51642bc7c4fc573b2a5a408e
parent 62b3e7a8

media/libmediametrics/MediaAnalyticsItem.cpp

+5 −5
Original line number Diff line number Diff line
@@ -214,12 +214,12 @@ AString MediaAnalyticsItem::getPkgName() const { 
    return mPkgName;

}



MediaAnalyticsItem &MediaAnalyticsItem::setPkgVersionCode(int32_t pkgVersionCode) {

MediaAnalyticsItem &MediaAnalyticsItem::setPkgVersionCode(int64_t pkgVersionCode) {

    mPkgVersionCode = pkgVersionCode;

    return *this;

}



int32_t MediaAnalyticsItem::getPkgVersionCode() const {

int64_t MediaAnalyticsItem::getPkgVersionCode() const {

    return mPkgVersionCode;

}
@@ -640,7 +640,7 @@ int32_t MediaAnalyticsItem::readFromParcel(const Parcel& data) { 
    mPid = data.readInt32();

    mUid = data.readInt32();

    mPkgName = data.readCString();

    mPkgVersionCode = data.readInt32();

    mPkgVersionCode = data.readInt64();

    mSessionID = data.readInt64();

    mFinalized = data.readInt32();

    mTimestamp = data.readInt64();
@@ -687,7 +687,7 @@ int32_t MediaAnalyticsItem::writeToParcel(Parcel *data) { 
    data->writeInt32(mPid);

    data->writeInt32(mUid);

    data->writeCString(mPkgName.c_str());

    data->writeInt32(mPkgVersionCode);

    data->writeInt64(mPkgVersionCode);

    data->writeInt64(mSessionID);

    data->writeInt32(mFinalized);

    data->writeInt64(mTimestamp);
@@ -766,7 +766,7 @@ AString MediaAnalyticsItem::toString(int version) { 


    if (version >= PROTO_V1) {

        result.append(mPkgName);

        snprintf(buffer, sizeof(buffer), ":%d:", mPkgVersionCode);

        snprintf(buffer, sizeof(buffer), ":%"  PRId64 ":", mPkgVersionCode);

        result.append(buffer);

    }

media/libmediametrics/include/MediaAnalyticsItem.h

+3 −3
Original line number Diff line number Diff line
@@ -173,8 +173,8 @@ class MediaAnalyticsItem { 
        MediaAnalyticsItem &setPkgName(AString);

        AString getPkgName() const;



        MediaAnalyticsItem &setPkgVersionCode(int32_t);

        int32_t getPkgVersionCode() const;

        MediaAnalyticsItem &setPkgVersionCode(int64_t);

        int64_t getPkgVersionCode() const;



        // our serialization code for binder calls

        int32_t writeToParcel(Parcel *);
@@ -205,7 +205,7 @@ class MediaAnalyticsItem { 
        pid_t     mPid;

        uid_t     mUid;

        AString   mPkgName;

        int32_t   mPkgVersionCode;

        int64_t   mPkgVersionCode;



        // let's reuse a binder connection

        static sp<IMediaAnalyticsService> sAnalyticsService;

services/mediaanalytics/MediaAnalyticsService.cpp

+3 −3
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ MediaAnalyticsItem::SessionID_t MediaAnalyticsService::submit(MediaAnalyticsItem 
    }



    ALOGV("given uid %d; sanitized uid: %d sanitized pkg: %s "

          "sanitized pkg version: %d",

          "sanitized pkg version: %"  PRId64,

          uid_given, item->getUid(),

          item->getPkgName().c_str(),

          item->getPkgVersionCode());
@@ -856,7 +856,7 @@ void MediaAnalyticsService::setPkgInfo(MediaAnalyticsItem *item, uid_t uid, bool 
    } else {

        AString pkg;

        std::string installer = "";

        int32_t versionCode = 0;

        int64_t versionCode = 0;



        struct passwd *pw = getpwuid(uid);

        if (pw) {
@@ -926,7 +926,7 @@ void MediaAnalyticsService::setPkgInfo(MediaAnalyticsItem *item, uid_t uid, bool 
                }





                ALOGV("package '%s' installed by '%s' versioncode %d / %08x",

                ALOGV("package '%s' installed by '%s' versioncode %"  PRId64 " / %" PRIx64,

                      pkg.c_str(), installer.c_str(), versionCode, versionCode);



                if (strncmp(installer.c_str(), "com.android.", 12) == 0) {

services/mediaanalytics/MediaAnalyticsService.h

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ class MediaAnalyticsService : public BnMediaAnalyticsService 
        uid_t uid;

        AString pkg;

        AString installer;

        int32_t versionCode;

        int64_t versionCode;

        nsecs_t expiration;

    };