Merge "BatteryService(jni): properly handle read's return value" into ics-mr0 (f0ad147f) · Commits · e / os / android_frameworks_base

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;
		}

		size_t count = read(fd, buf, size);
		ssize_t count = read(fd, buf, size);
		if (count > 0) {
		count = (count < size) ? count : size - 1;
		while (count > 0 && buf[count-1] == '\n') count--;
		while (count > 0 && buf[count-1] == '\n')
		count--;
		buf[count] = '\0';
		} else {
		buf[0] = '\0';