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

Commit beb470af authored by The Android Automerger's avatar The Android Automerger
Browse files

Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0" 

This reverts commit f0ad147f, reversing
changes made to bd9b1528.
parent 8e31988d

services/jni/com_android_server_BatteryService.cpp

+3 −3
Original line number Diff line number Diff line
@@ -141,10 +141,10 @@ static int readFromFile(const char* path, char* buf, size_t size) 
        return -1;

    }

    

    ssize_t count = read(fd, buf, size);

    size_t count = read(fd, buf, size);

    if (count > 0) {

        while (count > 0 && buf[count-1] == '\n')

            count--;

        count = (count < size) ? count : size - 1;

        while (count > 0 && buf[count-1] == '\n') count--;

        buf[count] = '\0';

    } else {

        buf[0] = '\0';