commit 26833f5724dbbdf37fe9c8485c1b3e674d4a9b11
author The Android Automerger <android-build@android.com> Sun Sep 18 07:02:08 2011 -0700
committer The Android Automerger <android-build@android.com> Sun Sep 18 07:02:08 2011 -0700
tree ce46e5c46fc29a5216ab04eb2125f9c1c7a05c78
parent 1d37ef6ecb25b2c2c974b32e14ce963882c7a699
parent a390e7fe9efbf1b667a381af5a1f6220107d6c34

merge in ics-release history after reset to master

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index a59431b..06f21dd 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -98,7 +98,7 @@
 // T & A Mobile Phones' USB Vendor ID
 #define VENDOR_ID_T_AND_A       0x1BBB
 // LenovoMobile's USB Vendor ID
-#define VENDOR_ID_LENOVOMOBILE        0x2006
+#define VENDOR_ID_LENOVOMOBILE  0x2006
 // Lenovo's USB Vendor ID
 #define VENDOR_ID_LENOVO        0x17EF
 // Vizio's USB Vendor ID
@@ -109,6 +109,8 @@
 #define VENDOR_ID_PEGATRON      0x1D4D
 // Archos's USB Vendor ID
 #define VENDOR_ID_ARCHOS        0x0E79
+// Positivo's USB Vendor ID
+#define VENDOR_ID_POSITIVO      0x1662
 
 
 /** built-in vendor list */
@@ -150,6 +152,7 @@
     VENDOR_ID_K_TOUCH,
     VENDOR_ID_PEGATRON,
     VENDOR_ID_ARCHOS,
+    VENDOR_ID_POSITIVO,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))

charger/charger.c

diff --git a/charger/charger.c b/charger/charger.c
index 5397487..9320e8a 100644
--- a/charger/charger.c
+++ b/charger/charger.c
@@ -53,7 +53,7 @@
 #define NSEC_PER_MSEC           (1000000LL)
 
 #define SCREEN_ON_TIME          (5 * MSEC_PER_SEC)
-#define POWER_ON_KEY_TIME       (5 * MSEC_PER_SEC)
+#define POWER_ON_KEY_TIME       (2 * MSEC_PER_SEC)
 #define UNPLUGGED_SHUTDOWN_TIME (10 * MSEC_PER_SEC)
 
 #define LOGE(x...) do { KLOG_ERROR("charger", x); } while (0)