merge in ics-mr1-release history after reset to ics-mr1
diff --git a/charger/charger.c b/charger/charger.c
index 03280bf..abf5517 100644
--- a/charger/charger.c
+++ b/charger/charger.c
@@ -87,6 +87,7 @@
const char *name;
int disp_time;
int min_capacity;
+ bool level_only;
gr_surface surface;
};
@@ -157,6 +158,7 @@
.name = "charger/battery_4",
.disp_time = 750,
.min_capacity = 80,
+ .level_only = true,
},
{
.name = "charger/battery_5",
@@ -735,7 +737,14 @@
* if necessary, advance cycle cntr, and reset frame cntr
*/
batt_anim->cur_frame++;
- if (batt_anim->cur_frame == batt_anim->num_frames) {
+
+ /* if the frame is used for level-only, that is only show it when it's
+ * the current level, skip it during the animation.
+ */
+ while (batt_anim->cur_frame < batt_anim->num_frames &&
+ batt_anim->frames[batt_anim->cur_frame].level_only)
+ batt_anim->cur_frame++;
+ if (batt_anim->cur_frame >= batt_anim->num_frames) {
batt_anim->cur_cycle++;
batt_anim->cur_frame = 0;
diff --git a/libnl_2/handlers.c b/libnl_2/handlers.c
index ec8d512..48dcab4 100644
--- a/libnl_2/handlers.c
+++ b/libnl_2/handlers.c
@@ -39,16 +39,14 @@
struct nl_cb *nl_cb_clone(struct nl_cb *orig)
{
struct nl_cb *new_cb;
- int new_refcnt;
new_cb = nl_cb_alloc(NL_CB_DEFAULT);
if (new_cb == NULL)
goto fail;
- /* Preserve reference count and copy original */
- new_refcnt = new_cb->cb_refcnt;
+ /* Copy original and set refcount to 1 */
memcpy(new_cb, orig, sizeof(*orig));
- new_cb->cb_refcnt = new_refcnt;
+ new_cb->cb_refcnt = 1;
return new_cb;
fail:
@@ -84,9 +82,9 @@
void nl_cb_put(struct nl_cb *cb)
{
+ if (!cb)
+ return;
cb->cb_refcnt--;
if (cb->cb_refcnt <= 0)
free(cb);
-
}
-
diff --git a/libnl_2/netlink.c b/libnl_2/netlink.c
index cc2f88e..ee3d600 100644
--- a/libnl_2/netlink.c
+++ b/libnl_2/netlink.c
@@ -59,15 +59,14 @@
{
int rc = -1;
int sk_flags;
- int RECV_BUF_SIZE;
+ int RECV_BUF_SIZE = getpagesize();
int errsv;
struct iovec recvmsg_iov;
struct msghdr msg;
/* Allocate buffer */
- RECV_BUF_SIZE = getpagesize();
*buf = (unsigned char *) malloc(RECV_BUF_SIZE);
- if (!buf) {
+ if (!(*buf)) {
rc = -ENOMEM;
goto fail;
}
@@ -91,8 +90,11 @@
errsv = errno;
fcntl(sk->s_fd, F_SETFL, sk_flags);
- if (rc < 0)
+ if (rc < 0) {
rc = -errsv;
+ free(*buf);
+ *buf = NULL;
+ }
fail:
return rc;
@@ -108,7 +110,6 @@
int rc, cb_rc = NL_OK, done = 0;
do {
-
unsigned char *buf;
int i, rem, flags;
struct nlmsghdr *nlh;
@@ -127,7 +128,7 @@
/* Check for callbacks */
- msg = (struct nl_msg *)malloc(sizeof(struct nl_msg));
+ msg = (struct nl_msg *) malloc(sizeof(struct nl_msg));
memset(msg, 0, sizeof(*msg));
msg->nm_nlh = nlh;
@@ -187,7 +188,6 @@
if (done)
break;
}
-
free(buf);
buf = NULL;
@@ -197,7 +197,7 @@
success:
fail:
- return rc;
+ return rc;
}
/* Send raw data over netlink socket */
diff --git a/libnl_2/socket.c b/libnl_2/socket.c
index ce54f19..d906cac 100644
--- a/libnl_2/socket.c
+++ b/libnl_2/socket.c
@@ -31,7 +31,7 @@
}
/* Allocate new netlink socket. */
-struct nl_sock *nl_socket_alloc(void)
+static struct nl_sock *_nl_socket_alloc(void)
{
struct nl_sock *sk;
struct timeval tv;
@@ -39,13 +39,13 @@
sk = (struct nl_sock *) malloc(sizeof(struct nl_sock));
if (!sk)
- goto fail;
+ return NULL;
memset(sk, 0, sizeof(*sk));
/* Get current time */
if (gettimeofday(&tv, NULL))
- return NULL;
+ goto fail;
else
sk->s_seq_next = (int) tv.tv_sec;
@@ -59,24 +59,36 @@
sk->s_peer.nl_pid = 0; /* Kernel */
sk->s_peer.nl_groups = 0; /* No groups */
- cb = (struct nl_cb *) malloc(sizeof(struct nl_cb));
+ return sk;
+fail:
+ free(sk);
+ return NULL;
+}
+
+/* Allocate new netlink socket. */
+struct nl_sock *nl_socket_alloc(void)
+{
+ struct nl_sock *sk = _nl_socket_alloc();
+ struct nl_cb *cb;
+
+ if (!sk)
+ return NULL;
+
+ cb = nl_cb_alloc(NL_CB_DEFAULT);
if (!cb)
goto cb_fail;
- memset(cb, 0, sizeof(*cb));
- sk->s_cb = nl_cb_alloc(NL_CB_DEFAULT);
-
-
+ sk->s_cb = cb;
return sk;
cb_fail:
free(sk);
-fail:
return NULL;
}
/* Allocate new socket with custom callbacks. */
struct nl_sock *nl_socket_alloc_cb(struct nl_cb *cb)
{
- struct nl_sock *sk = nl_socket_alloc();
+ struct nl_sock *sk = _nl_socket_alloc();
+
if (!sk)
return NULL;
@@ -84,7 +96,6 @@
nl_cb_get(cb);
return sk;
-
}
/* Free a netlink socket. */
@@ -116,5 +127,3 @@
{
return sk->s_fd;
}
-
-
diff --git a/libsysutils/src/NetlinkEvent.cpp b/libsysutils/src/NetlinkEvent.cpp
index fe96976..4beebb7 100644
--- a/libsysutils/src/NetlinkEvent.cpp
+++ b/libsysutils/src/NetlinkEvent.cpp
@@ -122,7 +122,6 @@
}
pm = (ulog_packet_msg_t *)NLMSG_DATA(nh);
devname = pm->indev_name[0] ? pm->indev_name : pm->outdev_name;
- SLOGD("QLOG prefix=%s dev=%s\n", pm->prefix, devname);
asprintf(&mParams[0], "ALERT_NAME=%s", pm->prefix);
asprintf(&mParams[1], "INTERFACE=%s", devname);
mSubsystem = strdup("qlog");