Commit graph

11309 commits

Author SHA1 Message Date
Andreas Gampe
4d47f0fcf1 am 1fc78d3d: Merge "Liblog: Remove unused function"
* commit '1fc78d3d0bc0676e58483afcb6b5035e598b6c31':
  Liblog: Remove unused function
2014-11-25 18:52:05 +00:00
Elliott Hughes
87fdfc718e am cb321921: Merge "fastboot: add parameter for unbuffered stderr/stdout"
* commit 'cb321921fe04f6ccaeb56c4bf3e8965ee4764738':
  fastboot: add parameter for unbuffered stderr/stdout
2014-11-25 18:52:01 +00:00
Andreas Gampe
276968f24c am 1f6be2b6: Merge "Libziparchive: Remove unused variable"
* commit '1f6be2b6355d26967993011bb92afb0754b90655':
  Libziparchive: Remove unused variable
2014-11-25 18:51:53 +00:00
Andreas Gampe
422ced07e5 am 374de72b: Merge "Libcutils: Remove unused variable"
* commit '374de72bbc218198e6a5f09ae4da853d02199b5c':
  Libcutils: Remove unused variable
2014-11-25 18:51:52 +00:00
Andreas Gampe
022a6c54b4 am f96c7bd4: Merge "Libutils: Comment out unused constants"
* commit 'f96c7bd4b0c9c6e5770cda034b696212c9c6336d':
  Libutils: Comment out unused constants
2014-11-25 18:51:48 +00:00
Daisuke Okitsu
59ad2fc312 am a5a4e9e0: sdcard: mount sdcard with the noexec option
* commit 'a5a4e9e0cad383f0c14dbe92a60b7d8150ae6b1f':
  sdcard: mount sdcard with the noexec option
2014-11-25 17:37:55 +00:00
Elliott Hughes
d6dc983078 am 744c4986: Merge "sdcard: mount sdcard with the noexec option"
* commit '744c4986a1cdbf5c2cbe71d149f1545052e4f33f':
  sdcard: mount sdcard with the noexec option
2014-11-25 12:59:15 +00:00
Andreas Gampe
1fc78d3d0b Merge "Liblog: Remove unused function" 2014-11-24 18:44:27 +00:00
Andreas Gampe
1f742864fa Liblog: Remove unused function
For build-system CFLAGS clean-up, remove unused function.

Change-Id: I8c28c4bbbadaea6a5b32483e9e220794967bdd4e
2014-11-24 10:36:55 -08:00
Elliott Hughes
cb321921fe Merge "fastboot: add parameter for unbuffered stderr/stdout" 2014-11-24 18:33:50 +00:00
Andreas Gampe
1f6be2b635 Merge "Libziparchive: Remove unused variable" 2014-11-24 18:11:56 +00:00
Andreas Gampe
374de72bbc Merge "Libcutils: Remove unused variable" 2014-11-24 18:09:46 +00:00
Andreas Gampe
d0e6dc1ad1 Libziparchive: Remove unused variable
For build-system CFLAGS clean-up, remove unused variable.

Change-Id: Icc33cf5d0a5fe9a77c277b100de01b70164cc351
2014-11-24 10:09:06 -08:00
Andreas Gampe
50c15f980d Libcutils: Remove unused variable
For build-system CFLAGS clean-up, remove unused variable.

Change-Id: Iaf6dd7b84ee4ef4734a48b37a4d0ca8287ca5fb5
2014-11-24 10:04:56 -08:00
Andreas Gampe
f96c7bd4b0 Merge "Libutils: Comment out unused constants" 2014-11-24 18:02:34 +00:00
Andreas Gampe
a53c815323 Libutils: Comment out unused constants
For build-system CFLAGS clean-up, "remove" unused variables.

Change-Id: Ic96f066981cd96ca16af81ee3fdbc972507e8c81
2014-11-24 09:43:10 -08:00
Florian Bäuerle
27ded4832d fastboot: add parameter for unbuffered stderr/stdout
This is useful for writing Windows GUIs that want to parse the output of
fastboot before it exits.

Change-Id: Ic0171fe379fc4db7b65b1501e5f2e771ac7c62c4
Signed-off-by: Florian Bäuerle <florian.bae@gmail.com>
2014-11-24 18:12:22 +01:00
Elliott Hughes
744c4986a1 Merge "sdcard: mount sdcard with the noexec option" 2014-11-24 17:09:50 +00:00
Daisuke Okitsu
a5a4e9e0ca sdcard: mount sdcard with the noexec option
Vold mounts the sdcard with noexec, but the fuse deamon
mounts with exec, so it is still possible to execute
binaries:

  /dev/fuse /storage/sdcard1 fuse rw,nosuid,nodev,relatime,
  user_id=1023,group_id=1023,default_permissions,allow_other 0 0

  /dev/block/vold/179:65 /mnt/media_rw/sdcard1 vfat rw,dirsync,
  nosuid,nodev,noexec,relatime,uid=1023,gid=1023,fmask=0007,
  dmask=0007,allow_utime=0020,codepage=cp437,iocharset=iso8859-1,
  shortname=mixed,utf8,errors=remount-ro 0 0

With this change both vold and fuse mounts with noexec.

(cherry picked from commit f777d6694eecf6e61d9859df2090199863050017)

Change-Id: I66cbfc3a3a89a26958f83577f5e7a5e27f99184e
2014-11-24 08:39:15 -08:00
Greg Hackmann
ba5d1bc86b am 8eff1df1: Merge "libadf: add tests for various failure modes"
* commit '8eff1df1cb3da41e88fd3a99dffcf5b3406d46a2':
  libadf: add tests for various failure modes
2014-11-24 16:03:45 +00:00
Greg Hackmann
a800c8524f am 7e2e3258: Merge "libadf: add tests"
* commit '7e2e32584530ddd9d0b5846bef9df3f36ee8a55b':
  libadf: add tests
2014-11-24 16:03:43 +00:00
Greg Hackmann
8eff1df1cb Merge "libadf: add tests for various failure modes" 2014-11-24 15:56:07 +00:00
Greg Hackmann
7e2e325845 Merge "libadf: add tests" 2014-11-24 15:55:58 +00:00
Daisuke Okitsu
00690852b4 sdcard: mount sdcard with the noexec option
Vold mounts the sdcard with noexec, but the fuse deamon
mounts with exec, so it is still possible to execute
binaries:

  /dev/fuse /storage/sdcard1 fuse rw,nosuid,nodev,relatime,
  user_id=1023,group_id=1023,default_permissions,allow_other 0 0

  /dev/block/vold/179:65 /mnt/media_rw/sdcard1 vfat rw,dirsync,
  nosuid,nodev,noexec,relatime,uid=1023,gid=1023,fmask=0007,
  dmask=0007,allow_utime=0020,codepage=cp437,iocharset=iso8859-1,
  shortname=mixed,utf8,errors=remount-ro 0 0

With this change both vold and fuse mounts with noexec.

Change-Id: I66cbfc3a3a89a26958f83577f5e7a5e27f99184e
2014-11-24 09:52:14 +01:00
Elliott Hughes
3d5b5162e3 am 7f187c5f: Merge "Lose clear, false, and true to toybox."
* commit '7f187c5f95d6bf0514e71e0e074768bd5395d45f':
  Lose clear, false, and true to toybox.
2014-11-23 18:10:39 +00:00
Elliott Hughes
7f187c5f95 Merge "Lose clear, false, and true to toybox." 2014-11-23 18:03:40 +00:00
Elliott Hughes
ed7959fe62 Lose clear, false, and true to toybox.
Change-Id: I125ea881e61b834b188d9a5411f3b6efe59b9bad
2014-11-22 22:58:42 -08:00
Elliott Hughes
b741221117 am 456661e3: Merge "Fix Mac build."
* commit '456661e38cefe1afbf640036f710f0d481b64bf9':
  Fix Mac build.
2014-11-22 15:42:41 +00:00
Elliott Hughes
456661e38c Merge "Fix Mac build." 2014-11-22 15:34:47 +00:00
Elliott Hughes
8c275ffcba Fix Mac build.
Change-Id: Iae697ae257cf4b1d675e2b758dd31d5a6a71ae4d
2014-11-22 07:25:02 -08:00
Elliott Hughes
e79cd67cfd am 0101b06f: Merge "Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN."
* commit '0101b06fa6f9863ee87e89757e70900c3a0e7bfc':
  Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.
2014-11-22 08:01:20 +00:00
Elliott Hughes
88cc0aded6 am eda16b98: Merge "Kill LOCAL_SOCKET_NAMESPACE."
* commit 'eda16b98dce3ef4c75b7b46c6acdab2b6970f54a':
  Kill LOCAL_SOCKET_NAMESPACE.
2014-11-22 07:56:37 +00:00
Elliott Hughes
0101b06fa6 Merge "Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN." 2014-11-22 07:51:19 +00:00
Elliott Hughes
eda16b98dc Merge "Kill LOCAL_SOCKET_NAMESPACE." 2014-11-22 07:48:16 +00:00
Elliott Hughes
97ac0e1bb4 Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.
Change-Id: I9e25ac9d27e95b04fb8bf7a66c619af0139d8b8f
2014-11-21 23:10:45 -08:00
Elliott Hughes
9768d24fa0 Kill LOCAL_SOCKET_NAMESPACE.
Change-Id: I18928f89f66c37be310c45ff4c05a6d47ab84f66
2014-11-21 22:50:20 -08:00
Nick Kralevich
f8304929a0 am 6fe92d1a: Merge "system/core: Remove AID_GRAPHICS from adb groups"
* commit '6fe92d1a3fb17545d82d020a3c995f32e6b71f9d':
  system/core: Remove AID_GRAPHICS from adb groups
2014-11-22 02:42:28 +00:00
Nick Kralevich
6fe92d1a3f Merge "system/core: Remove AID_GRAPHICS from adb groups" 2014-11-22 02:14:05 +00:00
Ajay Dudani
8432ddc822 system/core: Remove AID_GRAPHICS from adb groups
Remove AID_GRAPHICS from adb access groups to limit framebuffer
access.

Change-Id: I7fc6dca8b02a45d67d1ecc4a4daf6c38741ffb94
2014-11-21 18:08:05 -08:00
Dan Albert
e4fe1e967c am 06352ccb: Merge "Add a missing include."
* commit '06352ccb291554c13c1a3e714b558436050b6b74':
  Add a missing include.
2014-11-21 21:28:04 +00:00
Dan Albert
06352ccb29 Merge "Add a missing include." 2014-11-21 21:19:23 +00:00
Elliott Hughes
b0669f5aa2 am caed3d9f: Merge "notify: dynamically allocate filename buffer"
* commit 'caed3d9fae1fd372dfa01cb60fbf157233c9052e':
  notify: dynamically allocate filename buffer
2014-11-21 20:25:58 +00:00
Elliott Hughes
f799fac243 resolved conflicts for merge of bc2168c9 to lmp-mr1-dev-plus-aosp
Change-Id: Ic53ce9bdb658838368b4e9029a1f7a4137dd0499
2014-11-21 11:22:00 -08:00
Elliott Hughes
caed3d9fae Merge "notify: dynamically allocate filename buffer" 2014-11-21 19:13:01 +00:00
Elliott Hughes
30ebda5838 am 97e1e170: Merge "Disable vendor id filtering for OS X."
* commit '97e1e1704245d4c2edd8a9e155669aaae7341b7d':
  Disable vendor id filtering for OS X.
2014-11-21 19:08:16 +00:00
Elliott Hughes
542324f4b4 am 0750f786: Merge "Remove explict use of ASCII encoding"
* commit '0750f78659758352490e599d057a39dc44e93340':
  Remove explict use of ASCII encoding
2014-11-21 19:08:15 +00:00
Dan Albert
592d335055 Add a missing include.
Needed following the pthread.h/signal.h cleanup.

Change-Id: I9a43732eefdf49ecf769659dee1170626cf8fff9
2014-11-21 11:03:17 -08:00
Elliott Hughes
bc2168c9b0 Merge "Remove the adb usb vendor id whitelist." 2014-11-21 18:53:06 +00:00
Elliott Hughes
c66aed8a14 Remove the adb usb vendor id whitelist.
If there are bad vendors, we should blacklist them. Whitelisting the entire
world is crazy.

Change-Id: I1f4c27fd34fc420e2a3b4b2c8749198030db69f1
2014-11-21 10:44:10 -08:00
Elliott Hughes
97e1e17042 Merge "Disable vendor id filtering for OS X." 2014-11-21 18:42:28 +00:00