summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-10-20 16:45:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-20 16:45:50 -0700
commitc20f205d1059ff71b21d9c44ea147e209c364d2f (patch)
tree3ee7760ad01631874e943f7adbd979d237ce0115 /services
parenteceace47c575d15a3d4b7cd511c20f86850bf301 (diff)
parent5bfef1ba0501e237b3a0fa1abe98e5348d8c5b04 (diff)
downloadframeworks_base-c20f205d1059ff71b21d9c44ea147e209c364d2f.zip
frameworks_base-c20f205d1059ff71b21d9c44ea147e209c364d2f.tar.gz
frameworks_base-c20f205d1059ff71b21d9c44ea147e209c364d2f.tar.bz2
am 5bfef1ba: Merge "BatteryService: Set bool to true if sysfs entry is not 0"
Merge commit '5bfef1ba0501e237b3a0fa1abe98e5348d8c5b04' into gingerbread-plus-aosp * commit '5bfef1ba0501e237b3a0fa1abe98e5348d8c5b04': BatteryService: Set bool to true if sysfs entry is not 0
Diffstat (limited to 'services')
-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 397a84a..d4513e9 100644
--- a/services/jni/com_android_server_BatteryService.cpp
+++ b/services/jni/com_android_server_BatteryService.cpp
@@ -164,7 +164,7 @@ static void setBooleanField(JNIEnv* env, jobject obj, const char* path, jfieldID
jboolean value = false;
if (readFromFile(path, buf, SIZE) > 0) {
- if (buf[0] == '1') {
+ if (buf[0] != '0') {
value = true;
}
}