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

Commit a05554fb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder: Add an option to not log permission check failures." am:... 

Merge "libbinder: Add an option to not log permission check failures." am: ac9df9ed am: b9018b05

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

Change-Id: I4fdaa73d09621216f87e1cea263894f8e4f007b8
parents 108db786 b9018b05

libs/binder/IServiceManager.cpp

+5 −4
Original line number Original line Diff line number Diff line
@@ -154,8 +154,7 @@ bool checkCallingPermission(const String16& permission, int32_t* outPid, int32_t 
    return checkPermission(permission, pid, uid);

    return checkPermission(permission, pid, uid);

}

}





bool checkPermission(const String16& permission, pid_t pid, uid_t uid)

bool checkPermission(const String16& permission, pid_t pid, uid_t uid, bool logPermissionFailure) {

{

    static Mutex gPermissionControllerLock;

    static Mutex gPermissionControllerLock;

    static sp<IPermissionController> gPermissionController;

    static sp<IPermissionController> gPermissionController;
@@ -180,8 +179,10 @@ bool checkPermission(const String16& permission, pid_t pid, uid_t uid) 




            // Is this a permission failure, or did the controller go away?

            // Is this a permission failure, or did the controller go away?

            if (IInterface::asBinder(pc)->isBinderAlive()) {

            if (IInterface::asBinder(pc)->isBinderAlive()) {

                ALOGW("Permission failure: %s from uid=%d pid=%d",

                if (logPermissionFailure) {

                        String8(permission).string(), uid, pid);

                    ALOGW("Permission failure: %s from uid=%d pid=%d", String8(permission).string(),

                          uid, pid);

                }

                return false;

                return false;

            }

            }

libs/binder/include/binder/IServiceManager.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -167,7 +167,8 @@ status_t getService(const String16& name, sp<INTERFACE>* outService) 
bool checkCallingPermission(const String16& permission);

bool checkCallingPermission(const String16& permission);

bool checkCallingPermission(const String16& permission,

bool checkCallingPermission(const String16& permission,

                            int32_t* outPid, int32_t* outUid);

                            int32_t* outPid, int32_t* outUid);

bool checkPermission(const String16& permission, pid_t pid, uid_t uid);

bool checkPermission(const String16& permission, pid_t pid, uid_t uid,

                     bool logPermissionFailure = true);





#ifndef __ANDROID__

#ifndef __ANDROID__

// Create an IServiceManager that delegates the service manager on the device via adb.

// Create an IServiceManager that delegates the service manager on the device via adb.