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

Commit 99963892 authored by Kunal Malhotra's avatar Kunal Malhotra Committed by Automerger Merge Worker
Browse files

Merge "Adding in FGS Logger AIDL methods for use in C++ code" into udc-dev am:... 

Merge "Adding in FGS Logger AIDL methods for use in C++ code" into udc-dev am: 1b4cbc46 am: 682b13dc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21653490



Change-Id: Id6793cf7c0c5e993d29ee191f0a29a31b162d928
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 52f1cca4 682b13dc

libs/binder/IActivityManager.cpp

+47 −0
Original line number Diff line number Diff line
@@ -131,6 +131,53 @@ public: 
        *outResult = reply.readInt32();

        return NO_ERROR;

    }



    virtual status_t logFgsApiBegin(int32_t apiType, int32_t appUid, int32_t appPid) {

        Parcel data, reply;

        data.writeInterfaceToken(IActivityManager::getInterfaceDescriptor());

        data.writeInt32(apiType);

        data.writeInt32(appUid);

        data.writeInt32(appPid);

        status_t err = remote()->transact(LOG_FGS_API_BEGIN_TRANSACTION, data, &reply);

        if (err != NO_ERROR || ((err = reply.readExceptionCode()) != NO_ERROR)) {

            ALOGD("FGS Logger Transaction failed");

            ALOGD("%d", err);

            return err;

        }

        return NO_ERROR;

    }



    virtual status_t logFgsApiEnd(int32_t apiType, int32_t appUid, int32_t appPid) {

        Parcel data, reply;

        data.writeInterfaceToken(IActivityManager::getInterfaceDescriptor());

        data.writeInt32(apiType);

        data.writeInt32(appUid);

        data.writeInt32(appPid);

        status_t err = remote()->transact(LOG_FGS_API_END_TRANSACTION, data, &reply);

        if (err != NO_ERROR || ((err = reply.readExceptionCode()) != NO_ERROR)) {

            ALOGD("FGS Logger Transaction failed");

            ALOGD("%d", err);

            return err;

        }

        return NO_ERROR;

    }



    virtual status_t logFgsApiStateChanged(int32_t apiType, int32_t state, int32_t appUid,

                                           int32_t appPid) {

        Parcel data, reply;

        data.writeInterfaceToken(IActivityManager::getInterfaceDescriptor());

        data.writeInt32(apiType);

        data.writeInt32(state);

        data.writeInt32(appUid);

        data.writeInt32(appPid);

        status_t err = remote()->transact(LOG_FGS_API_BEGIN_TRANSACTION, data, &reply);

        if (err != NO_ERROR || ((err = reply.readExceptionCode()) != NO_ERROR)) {

            ALOGD("FGS Logger Transaction failed");

            ALOGD("%d", err);

            return err;

        }

        return NO_ERROR;

    }

};



// ------------------------------------------------------------------------------------

libs/binder/include_activitymanager/binder/IActivityManager.h

+7 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ public: 
                                    const pid_t pid,

                                    const uid_t uid,

                                    int32_t* outResult) = 0;

    virtual status_t logFgsApiBegin(int32_t apiType, int32_t appUid, int32_t appPid) = 0;

    virtual status_t logFgsApiEnd(int32_t apiType, int32_t appUid, int32_t appPid) = 0;

    virtual status_t logFgsApiStateChanged(int32_t apiType, int32_t state, int32_t appUid,

                                           int32_t appPid) = 0;



    enum {

        OPEN_CONTENT_URI_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION,
@@ -50,6 +54,9 @@ public: 
        IS_UID_ACTIVE_TRANSACTION,

        GET_UID_PROCESS_STATE_TRANSACTION,

        CHECK_PERMISSION_TRANSACTION,

        LOG_FGS_API_BEGIN_TRANSACTION,

        LOG_FGS_API_END_TRANSACTION,

        LOG_FGS_API_STATE_CHANGED_TRANSACTION

    };

};