commit 44e96d4302d5878ae7727de43a0c76525a4a68d8
author David 'Digit' Turner <digit@google.com> Thu Sep 22 07:56:56 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 22 07:56:56 2011 -0700
tree 55f0bd9670b606e866c3610fa2a815a09df91c5a
parent 303e6ac804c110ae54a51b56a217d70e97313c10
parent a503456526359767ffb383a06835308f62172dde

Merge "emulator: Move qemu-props to core service"

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/Android.mk

diff --git a/charger/Android.mk b/charger/Android.mk
index 75e78d5..cca329e 100644
--- a/charger/Android.mk
+++ b/charger/Android.mk
@@ -1,5 +1,7 @@
 # Copyright 2011 The Android Open Source Project
 
+ifneq ($(BUILD_TINY_ANDROID),true)
+
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -18,3 +20,5 @@
 LOCAL_STATIC_LIBRARIES += libz libstdc++ libcutils libc
 
 include $(BUILD_EXECUTABLE)
+
+endif

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)

libnetutils/ifc_utils.c

diff --git a/libnetutils/ifc_utils.c b/libnetutils/ifc_utils.c
index 04b0dfa..c482736 100644
--- a/libnetutils/ifc_utils.c
+++ b/libnetutils/ifc_utils.c
@@ -739,7 +739,7 @@
       struct in_addr gw)
 {
     int i =ifc_act_on_ipv4_route(SIOCADDRT, ifname, dst, prefix_length, gw);
-    printerr("ifc_add_ipv4_route(%s, xx, %d, xx) = %d", ifname, prefix_length, i);
+    if (DBG) printerr("ifc_add_ipv4_route(%s, xx, %d, xx) = %d", ifname, prefix_length, i);
     return i;
 }
 
@@ -755,7 +755,7 @@
 int ifc_add_route(const char *ifname, const char *dst, int prefix_length, const char *gw)
 {
     int i = ifc_act_on_route(SIOCADDRT, ifname, dst, prefix_length, gw);
-    printerr("ifc_add_route(%s, %s, %d, %s) = %d", ifname, dst, prefix_length, gw, i);
+    if (DBG) printerr("ifc_add_route(%s, %s, %d, %s) = %d", ifname, dst, prefix_length, gw, i);
     return i;
 }