Commit Graph

3141 Commits

Author SHA1 Message Date
Jean-Baptiste Queru a36e1aa3db Merge "adb: usb_windows: fix adb connection lost issue" 2012-05-11 14:47:20 -07:00
Jack Ren 1c4b760a5d adb: usb_windows: fix adb connection lost issue
Windows adb connection could be lost if the target
side kernel enables the kmemleak.

The root cause is that kmemleak downgrades USB
performance, and lead to Windows adb host application
timeout because usb_write()/usb_read()'s timeout time is
very short. That issue is not reproducible in Linux
host because its usb_write() timeout is 5s and usb_read()
is blocked until return:
                usb_write()         usb_read()
Linux           5000ms              blocked until return
Windows         500+len*8 ms        500+len*8 ms

To fix that issue, extend the Windows adb host usb_write
timeout time to 5 seconds and usb_read() as a blocked routine:
                usb_write()         usb_read()
Windows         5000ms              blocked until return

Change-Id: If54e2b4c396a5a06318c0ee0b3326a00e7661fbc
Signed-off-by: Yu Wang <yu.y.wang@intel.com>
Signed-off-by: Jin Can Zhuang <jin.can.zhuang@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2012-05-09 23:08:12 +08:00
Jean-Baptiste Queru d98c87c953 Merge "init: Fix chown and chmod for write-only files" 2012-05-06 08:08:43 -07:00
Benoit Goby 93574c619c init: Fix chown and chmod for write-only files
Change-Id: I570b631ced11ab104aafe7ebfe71bae4e380d8af
2012-05-04 16:29:41 -07:00
Nick Kralevich 09a96bef65 Merge "init: make chmod/mkdir/chown not follow symlinks" 2012-05-02 11:34:28 -07:00
Geremy Condra 42a9349dc4 init: make chmod/mkdir/chown not follow symlinks
This change brings init's do_chmod, mkdir, and do_chown into line
with open's O_NOFOLLOW semantics, causing them to fail when the
last element of their target path is a symlink.

Change-Id: If00e1a25cfe17ef6f738af4bf0541abd0c1b084b
2012-05-02 11:13:49 -07:00
Dima Zavin 29fea7b17a Merge "Added missing header to window.h" 2012-05-02 09:08:06 -07:00
Jean-Baptiste Queru c5d5a5e807 Merge "Kindle Fire USB ID" 2012-05-02 09:07:25 -07:00
Jeff Brown 331667ffc8 Use #define value of 1 to indicate presence of headers.
strace tests the value of HAVE_TERMIO_H and HAVE_SYS_UIO_H using

Change-Id: If899845503547410cf17d005733d1c0c6741e939
2012-04-28 11:12:53 -07:00
Colin Cross 87576b5feb Merge "Restrict zygote to system user." 2012-04-27 17:08:12 -07:00
Nick Kralevich 25dd43a9a5 Restrict zygote to system user.
CVE-2011-3918: Address denial of service attack against Android's
zygote process. This change enforces that only UID=system can
directly connect to zygote to spawn processes.

Change-Id: I89f5f05fa44ba8582920b66854df3e79527ae067
2012-04-27 14:18:02 -07:00
Colin Cross a02ff986fc Merge "init: Add noexec mount option" 2012-04-26 18:10:21 -07:00
Colin Cross 5b3eb07ed7 Merge "Prevent bit shifting if num bits is negative" 2012-04-26 13:31:29 -07:00
Jean-Baptiste Queru 307d9cfc16 Merge from AOSP
Change-Id: Iedb6ea4e1cf66edda8d91e3d432cb010e697ed44
2012-04-24 17:38:54 -07:00
Jean-Baptiste Queru 980a59b45d Forward compatibility
Change-Id: I51a5eb98fb3fa3e09f2eb75de128068572081046
2012-04-24 16:45:38 -07:00
Lars Svensson b6ee25e3ad init: Add noexec mount option
Change-Id: Ic13d66797a86d38432e79af0c3387ce986d0a19f
2012-04-23 13:27:48 -07:00
Homin Lee e17e4e5fad Added missing header to window.h
Added string.h for memset()

Change-Id: I48ebec4df82bb9ae0b5daac3c653b9c4dc42c502
Signed-off-by: Homin Lee <suapapa@insignal.co.kr>
2012-04-20 16:19:36 +09:00
Eric Laurent e4e3f20f57 type definition for future compat.
Change-Id: Ifaba69d556ecc2a881293a2217515ea7dc5bb1a9
2012-04-18 18:07:05 -07:00
Jon Sawyer 775ab9c99e Kindle Fire USB ID
Adds Lab126's USB id to the known USB Devices

Change-Id: I3cd5d90bba68123d5d3d2d67e1ab7d60137eb388
Signed-off-by: Jon Sawyer <jon@cunninglogic.com>
2012-04-15 12:39:59 -07:00
Andrew Hsieh 4b91e3328c am ef3eb5f7: Added rules to build 64-bit libraries: lib64cutils.a and lib64log.a
* commit 'ef3eb5f74022050666168922d96c79531401a16d':
  Added rules to build 64-bit libraries: lib64cutils.a and lib64log.a
2012-03-22 10:18:56 -07:00
Andrew Hsieh ef3eb5f740 Added rules to build 64-bit libraries: lib64cutils.a and lib64log.a
Both libraries are needed to build four shared libraries in 64-bit
for 64-bit emulator with "-gpu on"
  lib64OpenglRender.so
  lib64EGL_translator.so
  lib64GLES_CM_translator.so
  lib64GLES_V2_translator.so

Change-Id: If57f72d4661a74f1d5e537568881f39132e0b43d
2012-03-22 08:56:06 -07:00
The Android Open Source Project 3ebb3dad6e Reconcile with ics-mr1-release
Change-Id: I5e32c5ab33c5beeab7576a1984dc0add942c590b
2012-03-21 08:23:48 -07:00
The Android Automerger c2db4ffb87 merge in ics-mr1-release history after reset to ics-mr1 2012-03-10 09:07:32 -08:00
The Android Automerger 4e580885d8 merge in ics-mr1-release history after reset to ics-mr1 2012-03-09 19:24:04 -08:00
The Android Automerger de64d60444 merge in ics-mr1-release history after reset to ics-mr1 2012-03-08 20:46:16 -08:00
Chia-chi Yeh c8d1a0e18e am 5ebced39: init.rc: update the permission of /data/local.
* commit '5ebced39093d1223566166b8cc6abfe6729c487d':
  init.rc: update the permission of /data/local.
2012-03-08 14:27:08 -08:00
Chia-chi Yeh 5ebced3909 init.rc: update the permission of /data/local.
Bug: 6131945
Change-Id: I3094a471dcfb02b786f47b6778c8fed3726325ec
2012-03-07 15:13:39 -08:00
Colin Cross d39f9d9378 am 9cec99ba: Merge "Fix typo in queue_property_triggers ident"
* commit '9cec99ba9c64d26e2fa34f310cba13ff119b4c55':
  Fix typo in queue_property_triggers ident
2012-03-01 22:48:45 -08:00
Colin Cross 9cec99ba9c Merge "Fix typo in queue_property_triggers ident" 2012-03-01 16:31:08 -08:00
Chris Dearman 469b7b2da8 Fix typo in queue_property_triggers ident
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: I5f18ccb0912b9bb89c9f5104f9505c610c109af8
2012-03-01 15:29:20 -08:00
Jean-Baptiste Queru 1e28088f42 am 5cc398ef: Merge "Toolbox implementation of chown has a bad print"
* commit '5cc398ef00b439bcf85b65c894433dd52362dff7':
  Toolbox implementation of chown has a bad print
2012-02-28 15:06:10 -08:00
Jean-Baptiste Queru 428a6e3f56 am 13438a93: Merge "logwrapper: reduce verbosity and fix usage"
* commit '13438a93a8904ae712655533ce63aa0d5b486aba':
  logwrapper: reduce verbosity and fix usage
2012-02-28 15:06:09 -08:00
Jean-Baptiste Queru 5cc398ef00 Merge "Toolbox implementation of chown has a bad print" 2012-02-28 14:59:56 -08:00
Jean-Baptiste Queru 13438a93a8 Merge "logwrapper: reduce verbosity and fix usage" 2012-02-28 14:14:12 -08:00
Tanguy Pruvot 1f28b775cf logwrapper: reduce verbosity and fix usage
- no info on normal process exit (0)
 - basename as tag, not the full path
 - fix usage, bad "-x" parameter vs "-d" in code

Change-Id: Ife72729eaee2a366bd4226f3fbe3ba074219c974
2012-02-28 13:55:57 -08:00
Jean-Baptiste Queru 7c02a32756 am 1ea9fce4: Merge "Extend toolbox with SE Android support."
* commit '1ea9fce46f9782a21071b683b183226cb3468a0f':
  Extend toolbox with SE Android support.
2012-02-24 11:33:38 -08:00
Jean-Baptiste Queru ee79b455a9 am 93553073: Merge "Extend init and ueventd for SE Android."
* commit '935530736d6849c37c0e5c5e01b7e02245481f16':
  Extend init and ueventd for SE Android.
2012-02-24 11:11:48 -08:00
Jean-Baptiste Queru 1ea9fce46f Merge "Extend toolbox with SE Android support." 2012-02-24 11:10:56 -08:00
Jean-Baptiste Queru 935530736d Merge "Extend init and ueventd for SE Android." 2012-02-24 10:29:40 -08:00
Stephen Smalley 8290d1083e Extend toolbox with SE Android support.
Add -Z option to ls and ps for displaying security contexts.
Modify id to display security context.
Add new SELinux commands: chcon, getenforce, getsebool, load_policy, restorecon, runcon, setenforce, setsebool.

Change-Id: Ia20941be4a6cd706fe392fed6e38a37d880ec5f1
2012-02-03 11:11:15 -05:00
Stephen Smalley e46f9d510d Extend init and ueventd for SE Android.
Add SE Android support for init and ueventd.

init:
- Load policy at boot.
- Set the security context for service daemons and their sockets.
- New built-in commands: setcon, setenforce, restorecon, setsebool.
- New option for services: seclabel.

ueventd:
- Set the security context for device directories and nodes.

Change-Id: I98ed752cde503c94d99dfa5b5a47e3c33db16aac
2012-02-01 07:49:08 -05:00
The Android Open Source Project aee9fc1e4a Reconcile with ics-mr1-release
Change-Id: Ieaacd272ef768930f444735139215730b1c218b6
2012-01-30 13:37:06 -08:00
Jean-Baptiste Queru 142e895a1d am e83cd37e: am 0458d373: Merge "fastboot: set the language local string"
* commit 'e83cd37e58b00fb6b9eb50464067864ca0cb2ff7':
  fastboot: set the language local string
2012-01-27 14:00:21 -08:00
Jean-Baptiste Queru e83cd37e58 am 0458d373: Merge "fastboot: set the language local string"
* commit '0458d373261d89979529853fa63cdd998b12e04a':
  fastboot: set the language local string
2012-01-27 13:58:04 -08:00
Jean-Baptiste Queru 0458d37326 Merge "fastboot: set the language local string" 2012-01-27 10:13:52 -08:00
Bhanu Chetlapalli 65026f980a Prevent bit shifting if num bits is negative
Causes OpenGL Software Renderer to generate incorrect window
coordinates on MIPS & possibly x86

Change-Id: I3c51b6a5a4e6af75e9b31d9d47e4e4d894825888
Signed-off-by: Bhanu Chetlapalli <bhanu@mips.com>
2012-01-25 14:45:30 -08:00
The Android Automerger 0148e603d8 merge in ics-mr1-release history after reset to ics-mr1 2012-01-24 13:33:52 -08:00
Xavier Ducrohet 0c05409510 am 746f3243: Add USB vendor IDs for Quanta, INQ and Sony.
* commit '746f3243f6d30ab51a36dcfea76eac3ba29ac625':
  Add USB vendor IDs for Quanta, INQ and Sony.
2012-01-24 11:29:50 -08:00
Xavier Ducrohet 746f3243f6 Add USB vendor IDs for Quanta, INQ and Sony.
Change-Id: I224e067d9a64e8e9e7afbad0760a4b07f965bf83
2012-01-24 11:18:50 -08:00
Jean-Baptiste Queru 70580b20bc am 149ae11f: Merge "adb,fastboot: add USB support for Intel Vendor ID"
* commit '149ae11fb63818b470156e1652abfad0e08d486d':
  adb,fastboot: add USB support for Intel Vendor ID
2012-01-24 08:42:49 -08:00