am a37c3f18: Merge "Fix logspam when battery sysfs file not available." into jb-mr2-dev

* commit 'a37c3f18e64f45d19a019ab47429413481fded9f': Fix logspam when battery sysfs file not available.
2013-06-12 17:02:43 -07:00
parent ac6c862196 a37c3f18e6
commit 18c3bbfb78
1 changed files with 1 additions and 1 deletions
--- a/services/jni/com_android_server_BatteryService.cpp
+++ b/services/jni/com_android_server_BatteryService.cpp
@@ -144,7 +144,7 @@ static jint getBatteryHealth(const char* status)

 static int readFromFile(const String8& path, char* buf, size_t size)
 {
-    if (!path)
+    if (path.isEmpty())
        return -1;
    int fd = open(path.string(), O_RDONLY, 0);
    if (fd == -1) {