JP Abgrall
d3297c2bab
Merge "logwrap lib: make logwrapper less verbose when told to not log"
2013-02-20 07:17:32 +00: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
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
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
Jeffrey Brown
c5c410fe3d
am 4b9bdd33: am 90dd1402: am 241194ca: Merge "[MIPS] Benchmark test for MIPS memset16/memset32"
...
# By Duane Sand
# Via Android Git Automerger (2) and others
* commit '4b9bdd333362c1f58260c37306f1902fb215f7bf':
[MIPS] Benchmark test for MIPS memset16/memset32
2013-02-06 20:59:56 -08:00
Jeffrey Brown
caf9ae2db3
am 32fb9fed: am 1b9a6057: am 44508515: Merge "Tidy up long lines"
...
# By Duane Sand
# Via Android Git Automerger (2) and others
* commit '32fb9fed1ed954beb8fcadff9d09e0e1374fb145':
Tidy up long lines
2013-02-06 20:59:54 -08:00
Jeffrey Brown
4b9bdd3333
am 90dd1402: am 241194ca: Merge "[MIPS] Benchmark test for MIPS memset16/memset32"
...
# By Duane Sand
# Via Android Git Automerger (1) and others
* commit '90dd14029414af26e64e3232f37c84feaa317ea8':
[MIPS] Benchmark test for MIPS memset16/memset32
2013-02-06 20:57:06 -08:00
Jeffrey Brown
32fb9fed1e
am 1b9a6057: am 44508515: Merge "Tidy up long lines"
...
# By Duane Sand
# Via Android Git Automerger (1) and others
* commit '1b9a60574028fd1dd77d6c07efb369ecaaf91218':
Tidy up long lines
2013-02-06 20:57:05 -08:00
Jeffrey Brown
90dd140294
am 241194ca: Merge "[MIPS] Benchmark test for MIPS memset16/memset32"
...
# By Duane Sand
# Via Duane Sand (1) and Gerrit Code Review (1)
* commit '241194cad4b27ffd1cb574cb10c4c6941ef3882f':
[MIPS] Benchmark test for MIPS memset16/memset32
2013-02-06 20:54:02 -08:00
Jeffrey Brown
1b9a605740
am 44508515: Merge "Tidy up long lines"
...
# By Duane Sand
# Via Duane Sand (1) and Gerrit Code Review (1)
* commit '445085151cff012efefc329b9fa1a311d1d208be':
Tidy up long lines
2013-02-06 20:54:01 -08:00
Jeffrey Brown
241194cad4
Merge "[MIPS] Benchmark test for MIPS memset16/memset32"
2013-02-07 04:40:05 +00:00
Jeffrey Brown
445085151c
Merge "Tidy up long lines"
2013-02-07 04:32:19 +00:00
Jean-Baptiste Queru
3d7790edf4
am 719df321: (-s ours) Reset to state of AOSP (i.e. MR1.1 + AOSP contributions). DO NOT MERGE.
...
# Via Jean-Baptiste Queru
* commit '719df3218b0e922935f2afa396596f6991b68139':
2013-02-04 17:00:31 -08:00
Ian Rogers
9e195d160f
am 2f228c39: am 271d6dfb: (-s ours) am 78432ab1: Merge "Inline ldrex/strex for thumb2, remove ARMv5 remnants."
...
# Via Android Git Automerger (2) and others
* commit '2f228c395133db6d18a5d11b6103ea0f962b15f1':
Inline ldrex/strex for thumb2, remove ARMv5 remnants.
2013-02-04 11:29:34 -08:00
Jean-Baptiste Queru
724dd072e5
am 024f97c6: am 825f29b1: Merge from jb-mr1.1-dev
...
# Via Android Git Automerger (1) and Jean-Baptiste Queru (1)
* commit '024f97c67b179894d7333cd7c68d9787f2d9382f':
2013-02-04 11:29:23 -08:00
Devin Kim
fd398accb4
am 2b0c471c: am 693a3d6c: am 6a7a3245: am cf5c32c2: charger: Do not suspend when disconnecting from charger
...
# Via Android Git Automerger (3) and Iliyan Malchev (1)
* commit '2b0c471ce07b57449762cbfd4303a0855c022e45':
charger: Do not suspend when disconnecting from charger
2013-02-04 11:29:19 -08:00
choongryeol.lee
e2a12435c6
am 566cd8d1: am 83d16c9e: am 9190c0b3: am dec27f6e: (-s ours) charger: suspend enable in charger mode
...
# Via Android Git Automerger (3) and Iliyan Malchev (1)
* commit '566cd8d165c25be55779d992c784890f51dce3b6':
charger: suspend enable in charger mode
2013-02-04 11:29:19 -08:00
Ed Heyl
5a0249e549
am 823ce038: (-s ours) am 2507aed4: reset to 016806a7, but keep bad history for fast forward
...
# By Iliyan Malchev
# Via Android Git Automerger (3) and others
* commit '823ce03898c92336fe67276fe5e679ef382dfce0':
libsuspend: compile as a static library
2013-02-04 11:29:18 -08:00
Jean-Baptiste Queru
719df3218b
Reset to state of AOSP (i.e. MR1.1 + AOSP contributions). DO NOT MERGE.
2013-02-04 11:22:26 -08:00
Nick Kralevich
21291f1ac5
Revert "property_get: do argument checking."
...
This reverts commit 75cc88546b .
2013-02-04 09:49:13 -08:00
Nick Kralevich
91e63efeef
Revert "Fix win_sdk build."
...
This reverts commit 941daef629 .
Change-Id: I6b509492964baf535e0eeb1a731bf70c91715942
2013-02-04 09:48:54 -08:00
Nick Kralevich
941daef629
Fix win_sdk build.
...
Don't depend on sys/cdefs.h, which doesn't exist when building
for the host.Don't try to compile property_len() checking code
in mingw32, it doesn't work.
Change-Id: I6a56b759bd4e8d30d6ca136e43d6515bf7408cc6
2013-02-02 17:26:38 -08:00
Ian Rogers
2f228c3951
am 271d6dfb: (-s ours) am 78432ab1: Merge "Inline ldrex/strex for thumb2, remove ARMv5 remnants."
...
# Via Android Git Automerger (1) and others
* commit '271d6dfb9cfd3fee321ae14d43b067c97aa3a846':
Inline ldrex/strex for thumb2, remove ARMv5 remnants.
2013-02-01 17:44:32 -08:00
Ian Rogers
271d6dfb9c
am 78432ab1: Merge "Inline ldrex/strex for thumb2, remove ARMv5 remnants."
...
# Via Gerrit Code Review (1) and Ian Rogers (1)
* commit '78432ab1f42d59fed474365b95b7501dcccacebf':
Inline ldrex/strex for thumb2, remove ARMv5 remnants.
2013-02-01 17:11:02 -08:00
Ian Rogers
78432ab1f4
Merge "Inline ldrex/strex for thumb2, remove ARMv5 remnants."
2013-02-02 00:06:12 +00:00
Jean-Baptiste Queru
024f97c67b
am 825f29b1: Merge from jb-mr1.1-dev
...
# Via Jean-Baptiste Queru
* commit '825f29b1c8f0c420af5dc6b05f0dbbd5b1ec36bf':
2013-02-01 15:41:57 -08:00
Jean-Baptiste Queru
825f29b1c8
Merge from jb-mr1.1-dev
2013-02-01 15:37:53 -08:00
Colin Cross
544d196e22
am 7480c007: am b2639f40: Merge "Label sockets consistently with the seclabel value if specified."
...
# By Stephen Smalley
# Via Android Git Automerger (1) and others
* commit '7480c0079d8c7fcfd5b3d9decfdabfebde162781':
Label sockets consistently with the seclabel value if specified.
2013-02-01 15:28:52 -08:00
Nick Kralevich
cc62beebff
Merge "property_get: do argument checking."
2013-02-01 23:18:39 +00:00