commit 56ede7fac536b0daac964ff3b596c3492bd7b552
author Doug Zongker <dougz@android.com> Wed Jul 25 15:25:24 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 25 15:25:24 2012 -0700
tree 7a9a33c1fae83dfd0546ede4e1da9057cc02c6bb
parent a7a64579c24b6a6dd41105a85a1fd5901f7cdf14
parent 35d9ad5ae72de846967b91aed97060f0e8558661

Merge "support e=65537 for libmincrypt, DumpPublicKey"

fastboot/fastboot.c

diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index 6a14301..2a63905 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -54,8 +54,6 @@
 #define O_BINARY 0
 #endif
 
-#define DEFAULT_SPARSE_LIMIT (256 * 1024 * 1024)
-
 char cur_product[FB_RESPONSE_SZ + 1];
 
 void bootimg_set_cmdline(boot_img_hdr *h, const char *cmdline);
@@ -296,7 +294,7 @@
             "  -b <base_addr>                           specify a custom kernel base address\n"
             "  -n <page size>                           specify the nand page size. default: 2048\n"
             "  -S <size>[K|M|G]                         automatically sparse files greater than\n"
-            "                                           size. default: 256M, 0 to disable\n"
+            "                                           size.  0 to disable\n"
         );
 }
 
@@ -550,7 +548,7 @@
         if (target_sparse_limit > 0) {
             limit = target_sparse_limit;
         } else {
-            limit = DEFAULT_SPARSE_LIMIT;
+            return 0;
         }
     }
 
@@ -843,7 +841,7 @@
         return 1;
     }
 
-    if (!strcmp(*argv, "devices")) {
+    if (argc > 0 && !strcmp(*argv, "devices")) {
         skip(1);
         list_devices();
         return 0;

init/devices.c

diff --git a/init/devices.c b/init/devices.c
index 125f981..e081f90 100644
--- a/init/devices.c
+++ b/init/devices.c
@@ -660,7 +660,7 @@
 
 static void handle_device_event(struct uevent *uevent)
 {
-    if (!strcmp(uevent->action,"add"))
+    if (!strcmp(uevent->action,"add") || !strcmp(uevent->action, "change"))
         fixup_sys_perms(uevent->path);
 
     if (!strncmp(uevent->subsystem, "block", 5)) {

liblog/logd_write.c

diff --git a/liblog/logd_write.c b/liblog/logd_write.c
index a0a753b..168bdf8 100644
--- a/liblog/logd_write.c
+++ b/liblog/logd_write.c
@@ -146,7 +146,9 @@
         !strcmp(tag, "STK") ||
         !strcmp(tag, "CDMA") ||
         !strcmp(tag, "PHONE") ||
-        !strcmp(tag, "SMS"))
+        !strcmp(tag, "SMS") ||
+        !strcmp(tag, "IMS") ||
+        !strcmp(tag, "IMSFW"))
             log_id = LOG_ID_RADIO;
 
     vec[0].iov_base   = (unsigned char *) &prio;
@@ -174,7 +176,9 @@
         !strcmp(tag, "STK") ||
         !strcmp(tag, "CDMA") ||
         !strcmp(tag, "PHONE") ||
-        !strcmp(tag, "SMS"))
+        !strcmp(tag, "SMS") ||
+        !strcmp(tag, "IMS") ||
+        !strcmp(tag, "IMSFW"))
             bufID = LOG_ID_RADIO;
 
     vec[0].iov_base   = (unsigned char *) &prio;