commit aef403e917ddbf0576d69c1c0b6bb2fb75161afe
author Jamie Gennis <jgennis@google.com> Wed May 18 17:11:51 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 18 17:11:51 2011 -0700
tree 5ac852f99f4ad4aa4bfc86a35c8f23cbb9855f91
parent 70080d97cfcb3fe273207b1c739df587f5f93767
parent da1a1f629b0f3b3a63d9951de4381a41bc31fb91

Merge "fix a comment typo in system/graphics.h"

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/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 657797e..54873e0 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -150,6 +150,7 @@
     mkdir /data/misc/bluetoothd 0770 bluetooth bluetooth
     mkdir /data/misc/bluetooth 0770 system system
     mkdir /data/misc/keystore 0700 keystore keystore
+    mkdir /data/misc/keychain 0771 keychain keychain
     mkdir /data/misc/vpn 0770 system system
     mkdir /data/misc/systemkeys 0700 system system
     mkdir /data/misc/vpn/profiles 0770 system system