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

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

Merge "Use start/finish app ops in window manager - frameworks native"

parents 5aae3b08 616554c0

libs/binder/AppOpsManager.cpp

+4 −3
Original line number Diff line number Diff line
@@ -100,11 +100,12 @@ int32_t AppOpsManager::noteOp(int32_t op, int32_t uid, const String16& callingPa 
            : APP_OPS_MANAGER_UNAVAILABLE_MODE;

}



int32_t AppOpsManager::startOp(int32_t op, int32_t uid, const String16& callingPackage) {

int32_t AppOpsManager::startOpNoThrow(int32_t op, int32_t uid, const String16& callingPackage,

        bool startIfModeDefault) {

    sp<IAppOpsService> service = getService();

    return service != NULL

            ? service->startOperation(getToken(service), op, uid, callingPackage)

            : APP_OPS_MANAGER_UNAVAILABLE_MODE;

            ? service->startOperation(getToken(service), op, uid, callingPackage,

                    startIfModeDefault) : APP_OPS_MANAGER_UNAVAILABLE_MODE;

}



void AppOpsManager::finishOp(int32_t op, int32_t uid, const String16& callingPackage) {

libs/binder/IAppOpsService.cpp

+4 −2
Original line number Diff line number Diff line
@@ -61,13 +61,14 @@ public: 
    }



    virtual int32_t startOperation(const sp<IBinder>& token, int32_t code, int32_t uid,

                const String16& packageName) {

                const String16& packageName, bool startIfModeDefault) {

        Parcel data, reply;

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

        data.writeStrongBinder(token);

        data.writeInt32(code);

        data.writeInt32(uid);

        data.writeString16(packageName);

        data.writeInt32(startIfModeDefault ? 1 : 0);

        remote()->transact(START_OPERATION_TRANSACTION, data, &reply);

        // fail on exception

        if (reply.readExceptionCode() != 0) return MODE_ERRORED;
@@ -159,7 +160,8 @@ status_t BnAppOpsService::onTransact( 
            int32_t code = data.readInt32();

            int32_t uid = data.readInt32();

            String16 packageName = data.readString16();

            int32_t res = startOperation(token, code, uid, packageName);

            bool startIfModeDefault = data.readInt32() == 1;

            int32_t res = startOperation(token, code, uid, packageName, startIfModeDefault);

            reply->writeNoException();

            reply->writeInt32(res);

            return NO_ERROR;

libs/binder/include/binder/AppOpsManager.h

+2 −1
Original line number Diff line number Diff line
@@ -99,7 +99,8 @@ public: 


    int32_t checkOp(int32_t op, int32_t uid, const String16& callingPackage);

    int32_t noteOp(int32_t op, int32_t uid, const String16& callingPackage);

    int32_t startOp(int32_t op, int32_t uid, const String16& callingPackage);

    int32_t startOpNoThrow(int32_t op, int32_t uid, const String16& callingPackage,

            bool startIfModeDefault);

    void finishOp(int32_t op, int32_t uid, const String16& callingPackage);

    void startWatchingMode(int32_t op, const String16& packageName,

            const sp<IAppOpsCallback>& callback);

libs/binder/include/binder/IAppOpsService.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ public: 
    virtual int32_t checkOperation(int32_t code, int32_t uid, const String16& packageName) = 0;

    virtual int32_t noteOperation(int32_t code, int32_t uid, const String16& packageName) = 0;

    virtual int32_t startOperation(const sp<IBinder>& token, int32_t code, int32_t uid,

            const String16& packageName) = 0;

            const String16& packageName, bool startIfModeDefault) = 0;

    virtual void finishOperation(const sp<IBinder>& token, int32_t code, int32_t uid,

            const String16& packageName) = 0;

    virtual void startWatchingMode(int32_t op, const String16& packageName,