提交: 8cca0a3855239e3503f861d35ab9ec108ac66123 - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• 修订版: 8cca0a3855239e3503f861d35ab9ec108ac66123 (tree)
• 时间: 2010-02-27 16:12:48
• 作者: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

patch from Yi Sun to fix power status issue

更改概述

• modified: include/cutils/properties.h
• modified: vold/uevent.c
• modified: vold/uevent.h

差异

--- a/include/cutils/properties.h
+++ b/include/cutils/properties.h
@@ -28,7 +28,7 @@ extern "C" {
 ** WARNING: system/bionic/include/sys/system_properties.h also defines
 **          these, but with different names.  (TODO: fix that)
 */
-#define PROPERTY_KEY_MAX   32
+#define PROPERTY_KEY_MAX   128
 #define PROPERTY_VALUE_MAX  92
 
 /* property_get: returns the length of the value which will never be

--- a/vold/uevent.c
+++ b/vold/uevent.c
@@ -21,6 +21,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <cutils/properties.h>
 
 #include "vold.h"
 #include "uevent.h"
@@ -214,16 +215,31 @@ static void free_uevent(struct uevent *event)
     }
     free(event);
 }
+/*
+ * This function can not find correct parameter for certain cases
+ * for example, if you have xxx_bla and xxx, you will have no way
+ * to know whether xxx_bla or xxx will be matched.
+ * So to solve this issue, try to match with "="
+ */
+
 
 static char *get_uevent_param(struct uevent *event, char *param_name)
 {
     int i;
+    char buf[MAX_UEVENT_NAME_LEN];
 
     for (i = 0; i < UEVENT_PARAMS_MAX; i++) {
         if (!event->param[i])
             break;
-        if (!strncmp(event->param[i], param_name, strlen(param_name)))
-            return &event->param[i][strlen(param_name) + 1];
+        if (strlen(param_name) >= (MAX_UEVENT_NAME_LEN-1)) {
+            LOGE("%s: the size of %s is to big\n", __FUNCTION__, param_name);
+            break;
+        }
+        memcpy(buf,param_name,strlen(param_name));
+        buf[strlen(param_name)] = '=';
+        buf[strlen(param_name)+1] = '\0';
+        if (!strncmp(event->param[i], buf, strlen(buf)))
+            return &event->param[i][strlen(buf)];
     }
 
     LOGE("get_uevent_param(): No parameter '%s' found", param_name);
@@ -239,11 +255,26 @@ static char *get_uevent_param(struct uevent *event, char *param_name)
 static int handle_powersupply_event(struct uevent *event)
 {
     char *ps_type = get_uevent_param(event, "POWER_SUPPLY_TYPE");
+    char name[PROPERTY_VALUE_MAX];
+    int nlen ;
+    int ps_cap;
+    int ps_cap_full = 0;
+    float cap;
+    int capacity;
 
     if (!strcasecmp(ps_type, "battery")) {
-        char *ps_cap = get_uevent_param(event, "POWER_SUPPLY_CAPACITY");
-        int capacity = atoi(ps_cap);
-  
+        property_get(POWER_UEVENT_NAME_CHARGE_NOW,name, "POWER_SUPPLY_CAPACITY");
+        ps_cap = atoi(get_uevent_param(event, name));
+        nlen = property_get(POWER_UEVENT_NAME_CHARGE_FULL, name, NULL);
+        if (nlen > 0)
+            ps_cap_full = atoi(get_uevent_param(event, name));
+        if (ps_cap_full) {
+            cap = (ps_cap/ps_cap_full)*100;
+            capacity = (int)cap;
+        } else
+            capacity = ps_cap; /* G1 battery */
+
+        LOGE("%s: current cap:%d\n", __FUNCTION__, capacity);
         if (capacity < 5)
             low_batt = true;
         else

--- a/vold/uevent.h
+++ b/vold/uevent.h
@@ -18,4 +18,8 @@
 #ifndef _UEVENT_MSG_H
 #define _UEVENT_MSG_H
 
+#define MAX_UEVENT_NAME_LEN 512
+#define POWER_UEVENT_NAME_CHARGE_NOW "ro.power_supply.uevent.name.capacity.now"
+#define POWER_UEVENT_NAME_CHARGE_FULL "ro.power_supply.uevent.name.capacity.full"
+
 #endif