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

Commit e8ab5776 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Move system/core/ off NO_ERROR."

parents f7d154e1 643268f3

gatekeeperd/IGateKeeperService.cpp

+6 −6
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ status_t BnGateKeeperService::onTransact( 
            } else {

                reply->writeInt32(GATEKEEPER_RESPONSE_ERROR);

            }

            return NO_ERROR;

            return OK;

        }

        case VERIFY: {

            CHECK_INTERFACE(IGateKeeperService, data, reply);
@@ -102,7 +102,7 @@ status_t BnGateKeeperService::onTransact( 
            } else {

                reply->writeInt32(GATEKEEPER_RESPONSE_ERROR);

            }

            return NO_ERROR;

            return OK;

        }

        case VERIFY_CHALLENGE: {

            CHECK_INTERFACE(IGateKeeperService, data, reply);
@@ -141,7 +141,7 @@ status_t BnGateKeeperService::onTransact( 
            } else {

                reply->writeInt32(GATEKEEPER_RESPONSE_ERROR);

            }

            return NO_ERROR;

            return OK;

        }

        case GET_SECURE_USER_ID: {

            CHECK_INTERFACE(IGateKeeperService, data, reply);
@@ -149,20 +149,20 @@ status_t BnGateKeeperService::onTransact( 
            uint64_t sid = getSecureUserId(uid);

            reply->writeNoException();

            reply->writeInt64(sid);

            return NO_ERROR;

            return OK;

        }

        case CLEAR_SECURE_USER_ID: {

            CHECK_INTERFACE(IGateKeeperService, data, reply);

            uint32_t uid = data.readInt32();

            clearSecureUserId(uid);

            reply->writeNoException();

            return NO_ERROR;

            return OK;

        }

        case REPORT_DEVICE_SETUP_COMPLETE: {

            CHECK_INTERFACE(IGateKeeperService, data, reply);

            reportDeviceSetupComplete();

            reply->writeNoException();

            return NO_ERROR;

            return OK;

        }

        default:

            return BBinder::onTransact(code, data, reply, flags);

gatekeeperd/gatekeeperd.cpp

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ public: 
            write(fd, result, strlen(result) + 1);

        }



        return NO_ERROR;

        return OK;

    }



private:

healthd/BatteryMonitor.cpp

+5 −5
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ status_t BatteryMonitor::getProperty(int id, struct BatteryProperty *val) { 
        if (!mHealthdConfig->batteryChargeCounterPath.isEmpty()) {

            val->valueInt64 =

                getIntField(mHealthdConfig->batteryChargeCounterPath);

            ret = NO_ERROR;

            ret = OK;

        } else {

            ret = NAME_NOT_FOUND;

        }
@@ -367,7 +367,7 @@ status_t BatteryMonitor::getProperty(int id, struct BatteryProperty *val) { 
        if (!mHealthdConfig->batteryCurrentNowPath.isEmpty()) {

            val->valueInt64 =

                getIntField(mHealthdConfig->batteryCurrentNowPath);

            ret = NO_ERROR;

            ret = OK;

        } else {

            ret = NAME_NOT_FOUND;

        }
@@ -377,7 +377,7 @@ status_t BatteryMonitor::getProperty(int id, struct BatteryProperty *val) { 
        if (!mHealthdConfig->batteryCurrentAvgPath.isEmpty()) {

            val->valueInt64 =

                getIntField(mHealthdConfig->batteryCurrentAvgPath);

            ret = NO_ERROR;

            ret = OK;

        } else {

            ret = NAME_NOT_FOUND;

        }
@@ -387,7 +387,7 @@ status_t BatteryMonitor::getProperty(int id, struct BatteryProperty *val) { 
        if (!mHealthdConfig->batteryCapacityPath.isEmpty()) {

            val->valueInt64 =

                getIntField(mHealthdConfig->batteryCapacityPath);

            ret = NO_ERROR;

            ret = OK;

        } else {

            ret = NAME_NOT_FOUND;

        }
@@ -403,7 +403,7 @@ status_t BatteryMonitor::getProperty(int id, struct BatteryProperty *val) { 


    case BATTERY_PROP_BATTERY_STATUS:

        val->valueInt64 = getChargeStatus();

        ret = NO_ERROR;

        ret = OK;

        break;



    default:

libpixelflinger/codeflinger/ARMAssembler.cpp

+5 −6
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ int ARMAssembler::generate(const char* name) 
        disassemble(name);

    }



    return NO_ERROR;

    return OK;

}



uint32_t* ARMAssembler::pcForLabel(const char* label)
@@ -577,4 +577,3 @@ uint32_t ARMAssembler::reg_post(int Rm) 
}



}; // namespace android

libpixelflinger/codeflinger/Arm64Assembler.cpp

+1 −2
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ int ArmToArm64Assembler::generate(const char* name) 
        printf(format, name, int(pc()-base()), base(), pc(), duration);

        disassemble(name);

    }

    return NO_ERROR;

    return OK;

}



uint32_t* ArmToArm64Assembler::pcForLabel(const char* label)
@@ -1238,4 +1238,3 @@ uint32_t ArmToArm64Assembler::A64_EXTR_W(uint32_t Rd, uint32_t Rn, 
}



}; // namespace android