Fix logspam when battery sysfs file not available.

This was a regression caused by a recent change to use String8
instead of char*.  We missed the implicit null check here.

Bug: 9377604
Change-Id: I7eff138096622c47b5d45678010373dc82138384

diff --git a/services/jni/com_android_server_BatteryService.cpp b/services/jni/com_android_server_BatteryService.cpp
index 485c289..433950d 100644 (file)
--- 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) {