Commit graph

5123 commits

Author SHA1 Message Date
Nick Kralevich
09094e729b am 96f60a8c: am ff03bc30: Merge "fix mac sdk build."
* commit '96f60a8cf8a6e8e8c077339a27e417cd15645e1b':
  fix mac sdk build.
2013-02-22 21:44:07 -08:00
Nick Kralevich
96f60a8cf8 am ff03bc30: Merge "fix mac sdk build."
* commit 'ff03bc3024cb60d1840552f4e966f5b616fd861f':
  fix mac sdk build.
2013-02-22 21:41:43 -08:00
Nick Kralevich
ff03bc3024 Merge "fix mac sdk build." 2013-02-23 04:36:16 +00:00
Nick Kralevich
bb05a92cb1 fix mac sdk build.
For now, remove linux/capability.h . We're haven't started using
capabilities yet, and this file doesn't exist on mac builds.

Change-Id: Id6ec7fdb408bcdfdd538dac65187194c8ee226ff
2013-02-22 20:32:35 -08:00
Nick Kralevich
89b530d215 am 0d060d56: am e3f247c0: Merge "Add support for filesystem capabilities."
* commit '0d060d56d25e41e61dd46e348bff3c875cbc85cd':
  Add support for filesystem capabilities.
2013-02-22 18:31:42 -08:00
Nick Kralevich
0d060d56d2 am e3f247c0: Merge "Add support for filesystem capabilities."
* commit 'e3f247c0e55d8bfd7df66532e807e38983c47761':
  Add support for filesystem capabilities.
2013-02-22 18:28:13 -08:00
Nick Kralevich
e3f247c0e5 Merge "Add support for filesystem capabilities." 2013-02-23 02:03:36 +00:00
Ken Sumrall
6c2c121386 fs_mgr: add support for new recoveryonly flag
If a device has an ext4 partition that contains the radio
firmware, and that filesystem is not mounted in normal
operation, we need a flag to prevent mount_all from
mounting it, so the new flag recoveryonly was added.

Change-Id: I361800c494e751b04c4faf956870f15fd0d8fe20
2013-02-22 17:40:58 -08:00
Glenn Kasten
65e203070c Merge "Add directory for mediaserver" 2013-02-23 01:04:33 +00:00
Glenn Kasten
b0f908a957 Add directory for mediaserver
Bug: 8223560
Change-Id: Iccc6d439a848445cac0f5b30d1d663aed3f5344e
2013-02-22 14:54:45 -08:00
The Android Open Source Project
2448146982 am f6451116: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'f6451116423c6195a464b69b6e07aa8ef743e6b1':
  charger: Do not suspend when disconnecting from charger
  charger: suspend enable in charger mode
  libsuspend: compile as a static library
2013-02-22 13:45:37 -08:00
The Android Open Source Project
f645111642 Reconcile with jb-mr1-release - do not merge
Change-Id: Ie31a50f2edd4ef863f56f8939fcf8e806fb2ba0a
2013-02-22 13:42:53 -08:00
Nick Kralevich
fe8425b5c5 am c5ce4108: am 1b64957a: Merge "init.rc: allow IPPROTO_ICMP support"
* commit 'c5ce4108facc5a1b94fcf9469a189b2cbdfd5e76':
  init.rc: allow IPPROTO_ICMP support
2013-02-22 09:44:34 -08:00
Nick Kralevich
c5ce4108fa am 1b64957a: Merge "init.rc: allow IPPROTO_ICMP support"
* commit '1b64957a7952738b02d437ffe3d4de45127a160c':
  init.rc: allow IPPROTO_ICMP support
2013-02-22 09:42:12 -08:00
Nick Kralevich
1b64957a79 Merge "init.rc: allow IPPROTO_ICMP support" 2013-02-22 16:33:46 +00:00
Ken Sumrall
320abd3887 Merge "fs_mgr: support a unified fstab format." 2013-02-22 06:22:12 +00:00
Nick Kralevich
be341cc348 init.rc: allow IPPROTO_ICMP support
Allow userspace programs to create IPPROTO_ICMP sockets.

This socket type allows an unprivileged program to safely
send ICMP_ECHO messages and receive the corresponding
ICMP_ECHOREPLY messages, without relying on raw sockets or
setuid programs.

Please see http://lwn.net/Articles/443051/ for details.

In particular, this allows us to use a version of ping
which doesn't have any capabilities
(https://android-review.googlesource.com/52072).
In addition, this allows us to safely implement an IPv4 ICMP
based version of InetAddress.isReachable()
(https://code.google.com/p/android/issues/detail?id=20106)

Change-Id: I876718151efa8219c4f34f573e35e21256fe2316
2013-02-21 19:28:13 -08:00
Benoit Goby
1531c966c1 Merge "adb: Fix secure adb when booting with usb attached" 2013-02-21 23:55:57 +00:00
Ed Heyl
747b0cf109 Merge remote-tracking branch 'goog/jb-mr2-release' 2013-02-20 13:47:35 -08:00
Nick Kralevich
e9e74f3c88 Add support for filesystem capabilities.
Modify android_filesystem_config.h and add a capabilities
field. This field can be used to add filesystem capabilities
to a particular file.

Change-Id: If8953a322457ea7275aa6df75660b714e6dc678a
2013-02-20 12:51:28 -08:00
The Android Automerger
70012fcd2f merge in jb-mr2-release history after reset to master 2013-02-20 05:57:02 -08:00
JP Abgrall
d3297c2bab Merge "logwrap lib: make logwrapper less verbose when told to not log" 2013-02-20 07:17:32 +00:00
Ken Sumrall
ab6b852235 fs_mgr: support a unified fstab format.
Update fs_mgr to support more flags needed to unify the 3
fstabs currently in android into one.

Change-Id: Ie46cea61a5b19882c55098bdd70f39e78fb603be
2013-02-19 10:18:42 -08:00
The Android Automerger
c3215217a0 merge in jb-mr2-release history after reset to master 2013-02-19 09:52:53 -08:00
Nick Kralevich
080427e4e2 adb: drop capability bounding set on user builds
run-as: don't require CAP_DAC_OVERRIDE.

Prevent an adb spawned application from acquiring capabilities
other than

* CAP_NET_RAW
* CAP_SETUID
* CAP_SETGID

The only privileged programs accessible on user builds are
* /system/bin/ping
* /system/bin/run-as

and the capabilities above are sufficient to cover those
two programs.

If the kernel doesn't support file capabilities, we ignore
a prctl(PR_CAPBSET_DROP) failure. In a future CL, this could
become a fatal error.

Change-Id: I45a56712bfda35b5ad9378dde9e04ab062fe691a
2013-02-15 21:22:19 -08:00
Mathias Agopian
bcfa910611 Refactoring: Rename SurfaceTextureClient to Surface
Change-Id: Ie745d9adf5465834bb8bf751a2f88b19435fdf46
2013-02-15 12:48:01 -08:00
Nick Kralevich
b9c087031b am e149855a: am 523a2090: Merge "adb: Use 64 bit capabilities."
* commit 'e149855a816c98149a95725139ae66f193049ddd':
  adb: Use 64 bit capabilities.
2013-02-15 10:22:08 -08:00
Nick Kralevich
e149855a81 am 523a2090: Merge "adb: Use 64 bit capabilities."
* commit '523a20901b2afce7ad02c0011d70ed57f8bbb997':
  adb: Use 64 bit capabilities.
2013-02-15 10:19:40 -08:00
Nick Kralevich
523a20901b Merge "adb: Use 64 bit capabilities." 2013-02-15 18:07:46 +00:00
Nick Kralevich
109f4e16cb adb: Use 64 bit capabilities.
Fix the following kernel warning:

$ adb shell dmesg | grep adb
<6>[    7.813003] warning: `adbd' uses 32-bit capabilities (legacy support in use)

Change-Id: I3912302c5c577f1cb03f0c591834ab7b3a72ddf5
2013-02-15 09:33:13 -08:00
Elliott Hughes
3b7c584fe9 am 910b7a8b: am 17361134: Merge "Add a "smash-stack" option to crasher."
# Via Android Git Automerger (1) and others
* commit '910b7a8b88b29ee16c6014630b450dda56c5d578':
  Add a "smash-stack" option to crasher.
2013-02-14 16:21:04 -08:00
Elliott Hughes
910b7a8b88 am 17361134: Merge "Add a "smash-stack" option to crasher."
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '17361134180b178531979897f9c9867346a57f10':
  Add a "smash-stack" option to crasher.
2013-02-14 16:16:26 -08:00
Elliott Hughes
1736113418 Merge "Add a "smash-stack" option to crasher." 2013-02-14 23:50:21 +00:00
Elliott Hughes
df4200e8c2 Add a "smash-stack" option to crasher.
bionic's __stack_chk_fail was preventing debuggerd from dumping
stacks, which was not helpful.

Bug: 2487269
Change-Id: Idba2a274037b960dfb2ac1c21686323268c4b372
2013-02-14 14:41:57 -08:00
JP Abgrall
a689d13a19 logwrap lib: make logwrapper less verbose when told to not log
We don't care about exit codes if logwrap output is not requested.

Change-Id: Ibae5fe53527554a1fe865c2058deb0a128a9dde2
2013-02-13 16:31:58 -08:00
The Android Automerger
6f5f53ca76 merge in jb-mr2-release history after reset to master 2013-02-12 07:11:47 -08:00
Igor Murashkin
4869a68d56 am 1b69da3e: am 6711f76d: Merge "graphics.h: Remove unnecessary comments for Y8/Y16 formats" into jb-mr1-aah-dev
# Via Android (Google) Code Review (1) and others
* commit '1b69da3ef0f505b885f8621ca2dad44d46aa824e':
  graphics.h: Remove unnecessary comments for Y8/Y16 formats
2013-02-11 17:34:27 -08:00
Igor Murashkin
51b78949b2 am fbb4a5ac: am fba6c12a: Merge "graphics.h: add new Y8, Y16 formats" into jb-mr1-aah-dev
# Via Android (Google) Code Review (1) and others
* commit 'fbb4a5ac1b771b2df0786bb5587c7ed0d5f82089':
  graphics.h: add new Y8, Y16 formats
2013-02-11 17:34:14 -08:00
Dave Burke
9e76a29752 Merge "Revert "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes.""" 2013-02-12 01:05:42 +00:00
Ken Sumrall
79ebef0797 Merge "Raise the max file open limit in sdcard" 2013-02-12 00:05:19 +00:00
Ken Sumrall
2fd72cc221 Raise the max file open limit in sdcard
The default is 1024 files, and in some testing, the limit has been
hit.  This raises the limit to 8192.  Going higher starts to cause
performance issues (I started to notice that around 16K open files
in my testing) as sdcard does linear searches.  If a higher max
is needed, then the sdcard daemon will need some optimizations.

Bug: 7442187

Change-Id: I7aba7f4556ed70651f36244294a6756f3d6b8963
2013-02-11 15:42:22 -08:00
Dave Burke
eb22e6a52b Revert "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes.""
This reverts commit 87980b5c9f

Getting more reports of app crashes (e.g. 7990090), so given timeline for MR2, want to revert.

Change-Id: Ic2d101d2d1156b3864d5c9b88aa8c94cd5aa345f
2013-02-11 19:48:43 +00:00
Igor Murashkin
1b69da3ef0 am 6711f76d: Merge "graphics.h: Remove unnecessary comments for Y8/Y16 formats" into jb-mr1-aah-dev
# Via Android (Google) Code Review (1) and Igor Murashkin (1)
* commit '6711f76d244b22d8c39c33963d2d81504816eaf4':
  graphics.h: Remove unnecessary comments for Y8/Y16 formats
2013-02-11 11:48:38 -08:00
Igor Murashkin
6711f76d24 Merge "graphics.h: Remove unnecessary comments for Y8/Y16 formats" into jb-mr1-aah-dev 2013-02-11 19:46:22 +00:00
Igor Murashkin
d755b52b43 graphics.h: Remove unnecessary comments for Y8/Y16 formats
Change-Id: Ic80f6c4be7df9d9729334b97bb662eb2d0456c33
2013-02-11 11:34:53 -08:00
Igor Murashkin
fbb4a5ac1b am fba6c12a: Merge "graphics.h: add new Y8, Y16 formats" into jb-mr1-aah-dev
# Via Android (Google) Code Review (1) and Igor Murashkin (1)
* commit 'fba6c12a3e6ac5fabe91270293b1115f72fd48a1':
  graphics.h: add new Y8, Y16 formats
2013-02-11 11:20:53 -08:00
Igor Murashkin
fba6c12a3e Merge "graphics.h: add new Y8, Y16 formats" into jb-mr1-aah-dev 2013-02-11 19:16:16 +00:00
The Android Automerger
d14283ffcf merge in jb-mr2-release history after reset to master 2013-02-11 07:12:46 -08:00
Igor Murashkin
9e00e66ebc graphics.h: add new Y8, Y16 formats
Change-Id: I0cb3786d91f442b5f3b665dd78bf5f0dd4ae4cf0
2013-02-08 13:40:59 -08:00
Rom Lemarchand
2f34c5033e logwrap: Change semantics of NULL status in android_fork_execvp
When passing a NULL status to android_fork_execvp the return
status will now be the return value of the child if it exited
properly, otherwise a non-0 value will be returned.

Change-Id: I13309c61b37b6b3f9d5507f7d6484e7b6baaf8d0
2013-02-08 09:37:52 -08:00