commit fdb8247ee99e081f8f6f95cf5b2c6e094968a83c
author The Android Open Source Project <initial-contribution@android.com> Wed Nov 02 17:56:45 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 02 17:56:45 2011 +0000
tree 12781a96fb713cb9b71a8c2eed60712e8e5714bf
parent af0a8b2a90e11edb0c9697323e4cac94b0f30209
parent 0e4d9eb8f89be601d8b499e5fe40e2a25fca1bce

am 0e4d9eb8: Reconcile with ics-factoryrom-2-release

* commit '0e4d9eb8f89be601d8b499e5fe40e2a25fca1bce':
  Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
  Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
  Revert "Merge "Remove log spam" into ics-mr0"
  Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"

init/init.c

diff --git a/init/init.c b/init/init.c
index d10ca47..68e9f49 100755
--- a/init/init.c
+++ b/init/init.c
@@ -59,12 +59,12 @@
 #endif
 
 static char console[32];
-static char serialno[32];
-static char bootmode[32];
-static char baseband[32];
-static char carrier[32];
-static char bootloader[32];
-static char hardware[32];
+static char serialno[PROP_VALUE_MAX];
+static char bootmode[PROP_VALUE_MAX];
+static char baseband[PROP_VALUE_MAX];
+static char carrier[PROP_VALUE_MAX];
+static char bootloader[PROP_VALUE_MAX];
+static char hardware[PROP_VALUE_MAX];
 static unsigned revision = 0;
 static char qemu[32];