diff options
| author | Jeff Brown <jeffbrown@google.com> | 2013-06-12 23:59:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-12 23:59:01 +0000 |
| commit | a37c3f18e64f45d19a019ab47429413481fded9f (patch) | |
| tree | fb6f78e1d174dd6e1b66b6f633f91ef44598cbc0 | |
| parent | 30af45f47fd71feee0f9e5f8e049ba0380bc7793 (diff) | |
| parent | 04c699218a11ecd1a11b8a9a6b02d6a4e76c6b4a (diff) | |
| download | frameworks_base-a37c3f18e64f45d19a019ab47429413481fded9f.zip frameworks_base-a37c3f18e64f45d19a019ab47429413481fded9f.tar.gz frameworks_base-a37c3f18e64f45d19a019ab47429413481fded9f.tar.bz2 | |
Merge "Fix logspam when battery sysfs file not available." into jb-mr2-dev
| -rw-r--r-- | services/jni/com_android_server_BatteryService.cpp | 2 |
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 485c289..433950d 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) { |