From b6b117624b460fec104be94977ed64d190473182 Mon Sep 17 00:00:00 2001
From: The Android Automerger <android-build@android.com>
Date: Wed, 2 Nov 2011 21:04:32 -0700
Subject: [PATCH] Revert "Merge "BatteryService(jni): properly handle read's
 return value" into ics-mr0"

This reverts commit f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3, reversing
changes made to bd9b1528051a1b257768fdbc5077a2d4473b02dd.
---
 services/jni/com_android_server_BatteryService.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/jni/com_android_server_BatteryService.cpp b/services/jni/com_android_server_BatteryService.cpp
index 2ceb5356e624b..b9f2c1f182d17 100644
--- a/services/jni/com_android_server_BatteryService.cpp
+++ b/services/jni/com_android_server_BatteryService.cpp
@@ -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';