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

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

Merge "Fix inverted logic in isOperationRestricted"

parents 7266cd55 5180e467

services/sensorservice/SensorDirectConnection.cpp

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ int32_t SensorService::SensorDirectConnection::configureChannel(int handle, int 
        return NO_ERROR;

    }



    if (mService->isOperationRestricted(mOpPackageName)) {

    if (!mService->isOperationPermitted(mOpPackageName)) {

        return PERMISSION_DENIED;

    }

services/sensorservice/SensorService.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1691,13 +1691,13 @@ bool SensorService::isWhiteListedPackage(const String8& packageName) { 
    return (packageName.contains(mWhiteListedPackage.string()));

}



bool SensorService::isOperationRestricted(const String16& opPackageName) {

bool SensorService::isOperationPermitted(const String16& opPackageName) {

    Mutex::Autolock _l(mLock);

    if (mCurrentOperatingMode != RESTRICTED) {

    if (mCurrentOperatingMode == RESTRICTED) {

        String8 package(opPackageName);

        return !isWhiteListedPackage(package);

        return isWhiteListedPackage(package);

    }

    return false;

    return true;

}



void SensorService::UidPolicy::registerSelf() {

services/sensorservice/SensorService.h

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ private: 
    // allowed to register for or call flush on sensors. Typically only cts test packages are

    // allowed.

    bool isWhiteListedPackage(const String8& packageName);

    bool isOperationRestricted(const String16& opPackageName);

    bool isOperationPermitted(const String16& opPackageName);



    // Reset the state of SensorService to NORMAL mode.

    status_t resetToNormalMode();