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

Commit 95274490 authored by Nate Myren's avatar Nate Myren Committed by Automerger Merge Worker
Browse files

Merge "Properly unparcel return from note/startOperation" into sc-dev am: 875d75d3 

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

Change-Id: I4ff492baba0d1346c2f0fb206be335ecfe912c43
parents 52aa337b 875d75d3

libs/binder/IAppOpsService.cpp

+5 −1
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 


#include <binder/IAppOpsService.h>



#include <utils/Log.h>

#include <binder/Parcel.h>

#include <utils/Log.h>

#include <utils/String8.h>



#include <optional>
@@ -63,6 +63,8 @@ public: 
        remote()->transact(NOTE_OPERATION_TRANSACTION, data, &reply);

        // fail on exception

        if (reply.readExceptionCode() != 0) return MODE_ERRORED;

        // TODO b/184855056: extract to class

        reply.readInt32();

        reply.readByte();

        return reply.readInt32();

    }
@@ -85,6 +87,8 @@ public: 
        remote()->transact(START_OPERATION_TRANSACTION, data, &reply);

        // fail on exception

        if (reply.readExceptionCode() != 0) return MODE_ERRORED;

        // TODO b/184855056: extract to class

        reply.readInt32();

        reply.readByte();

        return reply.readInt32();

    }