Commit graph

11618 commits

Author SHA1 Message Date
Elliott Hughes
b99dbe9aaf am 4c2aec09: am aa3e17e1: Merge "Return path including executable instead of without"
* commit '4c2aec09cf2da437f3995ff4cac87e4c20d1d4b0':
  Return path including executable instead of without
2014-11-20 18:47:24 +00:00
Elliott Hughes
4c2aec09cf am aa3e17e1: Merge "Return path including executable instead of without"
* commit 'aa3e17e1b685218cddeb7a05e68ff1721a322147':
  Return path including executable instead of without
2014-11-20 18:43:12 +00:00
Elliott Hughes
330c3ee944 am 1bc314d3: am 51184950: Merge "Disable vendor id filtering for Linux."
* commit '1bc314d3dda8a2e34d48c3811c0b29b9135f9051':
  Disable vendor id filtering for Linux.
2014-11-20 18:40:04 +00:00
Elliott Hughes
1bc314d3dd am 51184950: Merge "Disable vendor id filtering for Linux."
* commit '511849507a7b2f4e259f6763c62f0c8619977b06':
  Disable vendor id filtering for Linux.
2014-11-20 18:36:18 +00:00
Elliott Hughes
aa3e17e1b6 Merge "Return path including executable instead of without" 2014-11-20 18:35:12 +00:00
Elliott Hughes
511849507a Merge "Disable vendor id filtering for Linux." 2014-11-20 18:28:06 +00:00
Al Sutton
26b53bb75e Return path including executable instead of without
The previous implementation returned the path the executable was in instead
of returning the path including the executable (i.e. it returned ...bin
instead of ...bin/executable). This is not what the original methods did
and caused the process forking of adb to fail.

This patch corrects the implementation.

Change-Id: Ib58497cab35706041f170c1bc97c31fd5d965f90
2014-11-20 13:33:57 +00:00
Elliott Hughes
55664906a8 Disable vendor id filtering for Linux.
It's time we switched to blacklisting any problematic devices rather than
slowly whitelisting the entire world. This seems to work for me, but let's
see how other people get on before coming back to actually remove the list.

We'll also need to find a Mac to test the equivalent Mac change.

Change-Id: I2bf583a27f9a3f98ef006ea62b906a4f89960507
2014-11-19 22:07:34 -08:00
Yabin Cui
6b35b295d3 am ebd8ba67: am 46ee85fc: Merge "kill HAVE_PREAD"
* commit 'ebd8ba674d5ccc9764efc3d2225a89b182aa1591':
  kill HAVE_PREAD
2014-11-20 05:26:15 +00:00
Yabin Cui
ebd8ba674d am 46ee85fc: Merge "kill HAVE_PREAD"
* commit '46ee85fcc301471aff9d95a817599349570dcef8':
  kill HAVE_PREAD
2014-11-20 05:21:54 +00:00
Yabin Cui
46ee85fcc3 Merge "kill HAVE_PREAD" 2014-11-20 05:15:04 +00:00
Yabin Cui
70160f4454 kill HAVE_PREAD
Bug: 18397613
Change-Id: I3990bd0f95cf38c5a9229180a1ddc699941892fc
2014-11-19 20:47:18 -08:00
Nick Kralevich
b77ad1a17a am 477fd014: logd: throttle SELinux denials to 20/sec automerge: 83d8556
* commit '477fd01483238c684a8a2cdf4cacb72365fa1dd1':
  logd: throttle SELinux denials to 20/sec
2014-11-19 22:49:16 +00:00
Nick Kralevich
477fd01483 logd: throttle SELinux denials to 20/sec
automerge: 83d8556

* commit '83d85563c51fa39cb61b836302a8c26fe0e2ace6':
  logd: throttle SELinux denials to 20/sec
2014-11-19 22:45:31 +00:00
Nick Kralevich
e12ce70b86 am 421e2d55: am 606bb5f2: Merge "logd: throttle SELinux denials to 20/sec"
* commit '421e2d55c87848890e9b2a851a0a16df5a30f56c':
  logd: throttle SELinux denials to 20/sec
2014-11-19 22:17:23 +00:00
Nick Kralevich
421e2d55c8 am 606bb5f2: Merge "logd: throttle SELinux denials to 20/sec"
* commit '606bb5f2e5f2913d5cb30ed87dd18da23dda1705':
  logd: throttle SELinux denials to 20/sec
2014-11-19 22:13:38 +00:00
Nick Kralevich
83d85563c5 logd: throttle SELinux denials to 20/sec
Impose a limit of 20 selinux denials per second. Denials beyond
that point don't add any value, and have the potential to cause
crashes or denial of service attacks.

Do some other misc cleanup while I'm here.

Bug: 18341932

(cherry picked from commit c234a1b879)

Change-Id: Ic5c96003db82e504baf301e87be5c8c539c73c2a
2014-11-19 14:06:53 -08:00
Nick Kralevich
606bb5f2e5 Merge "logd: throttle SELinux denials to 20/sec" 2014-11-19 22:02:15 +00:00
Elliott Hughes
6309cb35f7 am 2097e9a1: am 20860a28: Merge "Fix building on modern versions of Xcode and OS X."
* commit '2097e9a1491e850545cd0c38522c22dafd2cf6af':
  Fix building on modern versions of Xcode and OS X.
2014-11-19 22:00:18 +00:00
Elliott Hughes
2097e9a149 am 20860a28: Merge "Fix building on modern versions of Xcode and OS X."
* commit '20860a28c5be013da111cb794c92dae02aa30089':
  Fix building on modern versions of Xcode and OS X.
2014-11-19 21:55:28 +00:00
Elliott Hughes
20860a28c5 Merge "Fix building on modern versions of Xcode and OS X." 2014-11-19 21:48:32 +00:00
Nick Kralevich
c234a1b879 logd: throttle SELinux denials to 20/sec
Impose a limit of 20 selinux denials per second. Denials beyond
that point don't add any value, and have the potential to cause
crashes or denial of service attacks.

Do some other misc cleanup while I'm here.

Bug: 18341932
Change-Id: I6125d629ae4d6ae131d2e53bfa41e1f50277d402
2014-11-19 13:35:36 -08:00
Al Sutton
f456d47c50 Fix building on modern versions of Xcode and OS X.
Recent versions of XCode fail to compile the adb and fastboot binaries due to
two functions being deprecated in 10.9 (GetCurrentProcess and
ProcessInformationCopyDictionary), and the use of -Werrror.

This patch replaces the method implementations which use calls to methods
deprecated in the 10.9 SDK with versions which only call non-deprecated methods.

Change-Id: I855bf26aff45093ca9022924f3ecd1b80f2305a8
2014-11-19 19:50:48 +00:00
Yabin Cui
29e142760d am 26d2b64b: am 81906d4b: Merge "kill HAVE_MADVISE"
* commit '26d2b64ba84e926e46e8d41214c75461dfeeda78':
  kill HAVE_MADVISE
2014-11-19 04:40:09 +00:00
Yabin Cui
26d2b64ba8 am 81906d4b: Merge "kill HAVE_MADVISE"
* commit '81906d4b0c508dc308606ca232eaa055255abd1e':
  kill HAVE_MADVISE
2014-11-19 04:35:27 +00:00
Yabin Cui
81906d4b0c Merge "kill HAVE_MADVISE" 2014-11-19 04:25:59 +00:00
Yabin Cui
745c5f6ad0 kill HAVE_MADVISE
Change to avoid "unused parameter" warning. 

Bug: 18397020
Change-Id: I4b26de55314c78237daead8e873385b97cafe4d4
2014-11-19 04:03:27 +00:00
Yabin Cui
8a902ae9ff am ad450e63: am c8ad1809: Merge "kill HAVE_MADVISE"
* commit 'ad450e6361b13ebaa57bfa7f846159f2dbdbb710':
  kill HAVE_MADVISE
2014-11-19 03:35:22 +00:00
Yabin Cui
ad450e6361 am c8ad1809: Merge "kill HAVE_MADVISE"
* commit 'c8ad180983fb50c89179b7895896ad1f35cb885a':
  kill HAVE_MADVISE
2014-11-19 03:30:45 +00:00
Yabin Cui
c8ad180983 Merge "kill HAVE_MADVISE" 2014-11-19 03:17:46 +00:00
Yabin Cui
819b480b93 kill HAVE_MADVISE
Bug: 18397020
Change-Id: Ibc8d886d729c51932a403531888214de4e541452
2014-11-18 18:15:40 -08:00
Elliott Hughes
cc1be8520f am eda507e4: am 0655d38b: Merge "Revert "adb: Add USB vendor ID for Honeywell""
* commit 'eda507e4921bf6f027d88433fc4e15f4b860046d':
  Revert "adb: Add USB vendor ID for Honeywell"
2014-11-18 21:29:14 +00:00
Elliott Hughes
eda507e492 am 0655d38b: Merge "Revert "adb: Add USB vendor ID for Honeywell""
* commit '0655d38b0c998f294ad52f1f8e84233a48046e97':
  Revert "adb: Add USB vendor ID for Honeywell"
2014-11-18 21:23:58 +00:00
Elliott Hughes
0655d38b0c Merge "Revert "adb: Add USB vendor ID for Honeywell"" 2014-11-18 21:15:44 +00:00
Elliott Hughes
3e01bb85d6 Revert "adb: Add USB vendor ID for Honeywell"
This reverts commit 8c4c8e8988.

Change-Id: Ia1cad862f42e5bea3174ed2cc0eea5232fc0a858
2014-11-18 21:15:28 +00:00
Elliott Hughes
c1ebb22cbd am 450c4ad0: am 16068830: Merge "toolbox: enable mkswap to work on block devices"
* commit '450c4ad097673111965d9143dbc6671778c0b00c':
  toolbox: enable mkswap to work on block devices
2014-11-18 20:22:39 +00:00
Elliott Hughes
bfb5239393 am 23ac318d: am 91cb2cb3: Merge "toolbox: indicate why swap{on|off} failed"
* commit '23ac318d566df4b7397388ba1280899680414150':
  toolbox: indicate why swap{on|off} failed
2014-11-18 20:21:26 +00:00
Yabin Cui
bd51f58e08 am 0aa45710: am 6a56ad28: Merge "kill HAVE_TERMIO_H"
* commit '0aa45710d5c850bf673b14cf4894cee8eb43ce9b':
  kill HAVE_TERMIO_H
2014-11-18 20:19:12 +00:00
Elliott Hughes
450c4ad097 am 16068830: Merge "toolbox: enable mkswap to work on block devices"
* commit '16068830444361ab65cbc9804b76e2d415aff9a2':
  toolbox: enable mkswap to work on block devices
2014-11-18 19:19:49 +00:00
Elliott Hughes
1606883044 Merge "toolbox: enable mkswap to work on block devices" 2014-11-18 19:11:56 +00:00
Andrew Boie
d90615cefd toolbox: enable mkswap to work on block devices
Change-Id: I9b71ca3fa09ffbe12dcc4d04229edab80851db4d
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2014-11-18 10:42:14 -08:00
Elliott Hughes
23ac318d56 am 91cb2cb3: Merge "toolbox: indicate why swap{on|off} failed"
* commit '91cb2cb3411472a567c8ec4e8dad9d3a1ebc1dca':
  toolbox: indicate why swap{on|off} failed
2014-11-18 18:06:06 +00:00
Elliott Hughes
91cb2cb341 Merge "toolbox: indicate why swap{on|off} failed" 2014-11-18 17:57:59 +00:00
Yabin Cui
0aa45710d5 am 6a56ad28: Merge "kill HAVE_TERMIO_H"
* commit '6a56ad28c385ad799f25a1b90213b2367fcb9e22':
  kill HAVE_TERMIO_H
2014-11-18 02:32:53 +00:00
Yabin Cui
6a56ad28c3 Merge "kill HAVE_TERMIO_H" 2014-11-18 02:22:38 +00:00
Yabin Cui
d325e866c4 kill HAVE_TERMIO_H
Bug: 18398307
Change-Id: Idbb89a074cdf16869cae3f667e89472781f37a5f
2014-11-17 18:19:11 -08:00
Elliott Hughes
7320cd6123 am 83ebca02: am ac252357: Merge "Remove atomic-inline.h."
* commit '83ebca02903b9c17f6a8d56257bb46db94ed268c':
  Remove atomic-inline.h.
2014-11-17 23:20:55 +00:00
Elliott Hughes
83ebca0290 am ac252357: Merge "Remove atomic-inline.h."
* commit 'ac252357bb15cdeb7d4637a1cfeaa76810514715':
  Remove atomic-inline.h.
2014-11-17 23:16:44 +00:00
Elliott Hughes
ac252357bb Merge "Remove atomic-inline.h." 2014-11-17 23:08:42 +00:00
Elliott Hughes
c3914d2be2 Remove atomic-inline.h.
Change-Id: I3ac0229b9c516744e6a9c9d9e795b43bc9c5636b
2014-11-17 14:38:56 -08:00