diff options
author | Ruchi Kandoi <kandoiruchi@google.com> | 2014-06-20 11:46:40 -0700 |
---|---|---|
committer | Ruchi Kandoi <kandoiruchi@google.com> | 2014-06-20 11:46:40 -0700 |
commit | 4614f5097c66991319576e9adb68a834aae19f9e (patch) | |
tree | 36cc0015befe4ef15938f9321aba884ec3a2e53e /healthd | |
parent | 545b127a7834636fb80fdcca1b293cec711d4a7d (diff) | |
download | system_core-4614f5097c66991319576e9adb68a834aae19f9e.zip system_core-4614f5097c66991319576e9adb68a834aae19f9e.tar.gz system_core-4614f5097c66991319576e9adb68a834aae19f9e.tar.bz2 |
resolved conflicts for merge of de7bdc94 to master
Change-Id: I6dc10c8220c0984b31a05534b576ca25afdf5383
Diffstat (limited to 'healthd')
-rw-r--r-- | healthd/healthd.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/healthd/healthd.cpp b/healthd/healthd.cpp index a1912f1..30a4b42 100644 --- a/healthd/healthd.cpp +++ b/healthd/healthd.cpp @@ -205,7 +205,7 @@ static void periodic_chores() { healthd_battery_update(); } -#define UEVENT_MSG_LEN 1024 +#define UEVENT_MSG_LEN 2048 static void uevent_event(uint32_t /*epevents*/) { char msg[UEVENT_MSG_LEN+2]; char *cp; |