commit 70080d97cfcb3fe273207b1c739df587f5f93767
author Brian Carlstrom <bdc@google.com> Tue May 17 10:37:56 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 17 10:37:56 2011 -0700
tree cad585bdb829fb305cb887556eadd6b0b60f7507
parent 024447c3c3dcf63b54cc481f2c6ecbda10823269
parent a31a3511825375177d26ab27067352c2c8f42038

Merge "Make CertInstaller installed CA certs trusted by applications via default TrustManager (6 of 6)"

adb/backup_service.c

diff --git a/adb/backup_service.c b/adb/backup_service.c
index f5dc0b2..1e55efc 100644
--- a/adb/backup_service.c
+++ b/adb/backup_service.c
@@ -55,7 +55,7 @@
         char** backup_args;
 
         // child -- actually run the backup here
-        argc = 1; // room for the basic 'bu' argv[0]
+        argc = 2; // room for the basic 'bu' argv[0] and 'backup' argv[1]
         for (p = (char*)args; p && *p; ) {
             argc++;
             while (*p && *p != ':') p++;
@@ -64,7 +64,8 @@
 
         backup_args = (char**) alloca(argc*sizeof(char*) + 1);
         backup_args[0] = "bu";
-        argc = 1;   // run through again to build the argv array
+        backup_args[1] = "backup";
+        argc = 2;   // run through again to build the argv array
         for (p = (char*)args; *p; ) {
             backup_args[argc++] = p;
             while (*p && *p != ':') p++;

adb/usb_linux.c

diff --git a/adb/usb_linux.c b/adb/usb_linux.c
index b7ee4ec..4d55b74 100644
--- a/adb/usb_linux.c
+++ b/adb/usb_linux.c
@@ -605,6 +605,7 @@
         ctrl.wIndex = 0;
         ctrl.wLength = sizeof(languages);
         ctrl.data = languages;
+        ctrl.timeout = 1000;
 
         result = ioctl(usb->desc, USBDEVFS_CONTROL, &ctrl);
         if (result > 0)
@@ -620,6 +621,7 @@
             ctrl.wIndex = __le16_to_cpu(languages[i]);
             ctrl.wLength = sizeof(buffer);
             ctrl.data = buffer;
+            ctrl.timeout = 1000;
 
             result = ioctl(usb->desc, USBDEVFS_CONTROL, &ctrl);
             if (result > 0) {

rootdir/ueventd.rc

diff --git a/rootdir/ueventd.rc b/rootdir/ueventd.rc
index 51a4337..438cf0a 100644
--- a/rootdir/ueventd.rc
+++ b/rootdir/ueventd.rc
@@ -70,11 +70,11 @@
 /dev/bus/usb/*            0660   root       usb
 /dev/mtp_usb              0660   root       mtp
 /dev/usb_accessory        0660   root       usb
+/dev/tun                  0660   system     vpn
 
 # CDMA radio interface MUX
 /dev/ts0710mux*           0640   radio      radio
 /dev/ppp                  0660   radio      vpn
-/dev/tun                  0640   vpn        vpn
 
 # sysfs properties
 /sys/devices/virtual/input/input*   enable      0660  root   input