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

Commit bf24ca45 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not log permission check failures." into tm-dev am: 56becd9a 

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



Change-Id: I2ad38ea27d15d4d39fa558275df0a7d886005896
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47ace080 56becd9a

services/sensorservice/SensorService.cpp

+5 −2
Original line number Original line Diff line number Diff line
@@ -2030,7 +2030,9 @@ bool SensorService::hasPermissionForSensor(const Sensor& sensor) { 
    // Runtime permissions can't use the cache as they may change.

    // Runtime permissions can't use the cache as they may change.

    if (sensor.isRequiredPermissionRuntime()) {

    if (sensor.isRequiredPermissionRuntime()) {

        hasPermission = checkPermission(String16(requiredPermission),

        hasPermission = checkPermission(String16(requiredPermission),

                IPCThreadState::self()->getCallingPid(), IPCThreadState::self()->getCallingUid());

                IPCThreadState::self()->getCallingPid(),

                IPCThreadState::self()->getCallingUid(),

                /*logPermissionFailure=*/ false);

    } else {

    } else {

        hasPermission = PermissionCache::checkCallingPermission(String16(requiredPermission));

        hasPermission = PermissionCache::checkCallingPermission(String16(requiredPermission));

    }

    }
@@ -2211,7 +2213,8 @@ bool SensorService::isRateCappedBasedOnPermission(const String16& opPackageName) 
    int targetSdk = getTargetSdkVersion(opPackageName);

    int targetSdk = getTargetSdkVersion(opPackageName);

    bool hasSamplingRatePermission = checkPermission(sAccessHighSensorSamplingRatePermission,

    bool hasSamplingRatePermission = checkPermission(sAccessHighSensorSamplingRatePermission,

            IPCThreadState::self()->getCallingPid(),

            IPCThreadState::self()->getCallingPid(),

            IPCThreadState::self()->getCallingUid());

            IPCThreadState::self()->getCallingUid(),

            /*logPermissionFailure=*/ false);

    if (targetSdk < __ANDROID_API_S__ ||

    if (targetSdk < __ANDROID_API_S__ ||

            (targetSdk >= __ANDROID_API_S__ && hasSamplingRatePermission)) {

            (targetSdk >= __ANDROID_API_S__ && hasSamplingRatePermission)) {

        return false;

        return false;