commit 3e8ba436854ecbd15f494ff7ebb9927fa47cb11b
author Doug Zongker <dougz@android.com> Tue Jan 10 10:19:00 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 10 10:19:00 2012 -0800
tree 4d79645e104a0c6459861684b398c3ea28239cc7
parent 0a7b45acd13faadd64c607c8dece3a7ee9e445d3
parent 9270a20a801403c9f60d6a701b39eae70d380403

Merge "support "sideload over ADB" mode"

etc/init.rc

diff --git a/etc/init.rc b/etc/init.rc
index 554d4e6..9f0ef57 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -38,9 +38,9 @@
     write /sys/class/android_usb/android0/idProduct D001
     write /sys/class/android_usb/android0/functions adb
     write /sys/class/android_usb/android0/enable 1
-    write /sys/class/android_usb/android0/iManufacturer $ro.product.manufacturer
-    write /sys/class/android_usb/android0/iProduct $ro.product.model
-    write /sys/class/android_usb/android0/iSerial $ro.serialno
+    write /sys/class/android_usb/android0/iManufacturer ${ro.product.manufacturer}
+    write /sys/class/android_usb/android0/iProduct ${ro.product.model}
+    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
     start adbd
 
 # Restart adbd so it can run as root

mtdutils/flash_image.c

diff --git a/mtdutils/flash_image.c b/mtdutils/flash_image.c
index 8e0e8d5..a39d600 100644
--- a/mtdutils/flash_image.c
+++ b/mtdutils/flash_image.c
@@ -42,7 +42,7 @@
     }
 
     fprintf(stderr, "%s\n", buf);
-    LOGE("%s\n", buf);
+    ALOGE("%s\n", buf);
     exit(1);
 }