summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2013-06-12 17:02:43 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-06-12 17:02:43 -0700
commit18c3bbfb7840f465ffa292f49d98c3b617dea1e5 (patch)
tree7a6f6c9b0951cae546433cbb7d93cc96fd25767d
parentac6c862196a62855e5c48d78b2a509943ec300b5 (diff)
parenta37c3f18e64f45d19a019ab47429413481fded9f (diff)
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.
-rw-r--r--services/jni/com_android_server_BatteryService.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/jni/com_android_server_BatteryService.cpp b/services/jni/com_android_server_BatteryService.cpp
index 485c289e68dd..433950d72f7a 100644
--- 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) {