Elliott Hughes
84ca63eef2
Merge "libpixelflinger: MIPS64 assembler test bug fix"
...
am: f8d892c84a
* commit 'f8d892c84a2cec5f6ac24748d966873e69227041':
libpixelflinger: MIPS64 assembler test bug fix
2015-12-16 18:40:10 +00:00
Elliott Hughes
6ed33e5ada
Merge "Make host ashmem_create_region more robust."
...
am: ec2f506e74
* commit 'ec2f506e741bbc9252d25f0f2ba1c24b1aa0ab7d':
Make host ashmem_create_region more robust.
2015-12-16 18:40:04 +00:00
Elliott Hughes
14f74dae87
Merge "More idiomatic cleanup of 9f75a035713d216469f1cabfe4a65f7864e2145a."
...
am: a48dc55f32
* commit 'a48dc55f326937d29a791e4016f980c589612333':
More idiomatic cleanup of 9f75a03571
.
2015-12-16 18:39:58 +00:00
Elliott Hughes
f8d892c84a
Merge "libpixelflinger: MIPS64 assembler test bug fix"
2015-12-16 18:23:49 +00:00
Elliott Hughes
ec2f506e74
Merge "Make host ashmem_create_region more robust."
2015-12-16 18:22:57 +00:00
Elliott Hughes
a48dc55f32
Merge "More idiomatic cleanup of 9f75a035713d216469f1cabfe4a65f7864e2145a."
2015-12-16 18:12:39 +00:00
Elliott Hughes
9e7893bf86
More idiomatic cleanup of 9f75a03571
.
...
Change-Id: Id936946375d2be56ba10bf3aa5804f52cdbecc2d
2015-12-16 08:45:05 -08:00
Elliott Hughes
3918090252
Make host ashmem_create_region more robust.
...
Don't clobber errno if mkstemp failed, always unlink, and only count
mkstemp/ftruncate failures as real failures --- if only the unlink
fails, there's no point not using what we have.
Change-Id: I6bc788682c88651a50a6316b9ca07ba07e9fefa2
2015-12-16 08:33:52 -08:00
Nick Kralevich
85ac05f480
Merge "adbd: make a PR_CAPBSET_DROP error fatal."
...
am: 57134adecb
* commit '57134adecbcbc988922295c466e174c04251b53a':
adbd: make a PR_CAPBSET_DROP error fatal.
2015-12-16 01:57:14 +00:00
Nick Kralevich
57134adecb
Merge "adbd: make a PR_CAPBSET_DROP error fatal."
2015-12-16 01:46:56 +00:00
Nick Kralevich
9f75a03571
adbd: make a PR_CAPBSET_DROP error fatal.
...
Back in 080427e4e2
, we said:
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.
Make it a fatal error. With SELinux support, all devices are
required to support file capabilities.
Change-Id: I0ce0c4cb9387c42e325cbf1a63c5d82e6aab530c
2015-12-15 16:54:53 -08:00
Mark Salyzyn
c895270ef2
Merge "logd: simpleperf inspired optimizations"
...
am: 7c20ab3e73
* commit '7c20ab3e73421e4a36c8b3a0fc0d1c49653ab51b':
logd: simpleperf inspired optimizations
2015-12-15 23:10:22 +00:00
Mark Salyzyn
7c20ab3e73
Merge "logd: simpleperf inspired optimizations"
2015-12-15 23:03:46 +00:00
Mark Salyzyn
1d9c7e728f
logd: simpleperf inspired optimizations
...
memset is hot on log writes with too much overhead, not required.
Bug: 24444530
Bug: 23685592
Change-Id: Ibe3c83abca6774fc79a3be461f2f1585f4a9b1ff
2015-12-15 14:24:04 -08:00
Alain Vongsouvanh
c5d342b997
logcatd: up size from 16MB to 256MB am: 2f18b54502
am: 85c3bbed4c
...
am: 332291e9f1
-s ours
* commit '332291e9f1262827840cf61cfca2f9d7929d9187':
logcatd: up size from 16MB to 256MB
2015-12-15 18:23:55 +00:00
Alain Vongsouvanh
332291e9f1
logcatd: up size from 16MB to 256MB am: 2f18b54502
...
am: 85c3bbed4c
* commit '85c3bbed4cb66a7829a6f9f402c89cfe15f11625':
logcatd: up size from 16MB to 256MB
2015-12-15 17:51:47 +00:00
Alain Vongsouvanh
85c3bbed4c
logcatd: up size from 16MB to 256MB
...
am: 2f18b54502
* commit '2f18b5450293c2360f688cd059989e36ba5a988c':
logcatd: up size from 16MB to 256MB
2015-12-15 09:47:57 -08:00
Ljubomir Papuga
e0c9f2bc5a
libpixelflinger: MIPS64 assembler test bug fix
...
Change-Id: I47f77790baabea85ee318976a2c44ab1c0c0b9cb
2015-12-15 15:23:01 +01:00
Greg Hackmann
d57d863e2e
Merge "cutils: trace: add DATABASE tag"
...
am: 461a29540c
* commit '461a29540c01b44f07fc26ccb0d5bc7d0d92a974':
cutils: trace: add DATABASE tag
2015-12-14 13:20:35 -08:00
Greg Hackmann
461a29540c
Merge "cutils: trace: add DATABASE tag"
2015-12-14 21:12:52 +00:00
Elliott Hughes
40f80e25d3
Merge "Share the new adb USB diagnostic code with fastboot."
...
am: efd8c3289e
* commit 'efd8c3289ed80dbae0813b06fb283b29273bbc66':
Share the new adb USB diagnostic code with fastboot.
2015-12-14 12:43:52 -08:00
Elliott Hughes
efd8c3289e
Merge "Share the new adb USB diagnostic code with fastboot."
2015-12-14 20:29:46 +00:00
Elliott Hughes
1b708d368f
Share the new adb USB diagnostic code with fastboot.
...
Bug: http://b/26134129
Change-Id: Ieaf0651c7b3f8a028760982091ec63a21a5484ba
2015-12-14 10:50:21 -08:00
Dimitry Ivanov
4bbed77aaf
Merge "Temporary disable linker-namespaces"
...
am: 9fb5047549
* commit '9fb50475497ab66ad547ffd17cc5a611b422cd09':
Temporary disable linker-namespaces
2015-12-11 22:22:00 -08:00
Dimitry Ivanov
9fb5047549
Merge "Temporary disable linker-namespaces"
2015-12-12 06:16:23 +00:00
Elliott Hughes
54a584d722
Merge "Remove fastboot/genkey.sh."
...
am: 796ea6a65d
* commit '796ea6a65d790fba1a9d77cfcaf453825936a146':
Remove fastboot/genkey.sh.
2015-12-11 18:32:36 -08:00
Elliott Hughes
796ea6a65d
Merge "Remove fastboot/genkey.sh."
2015-12-12 02:25:13 +00:00
Dimitry Ivanov
c18ac7cd2b
Temporary disable linker-namespaces
...
Bug: http://b/26164393
Change-Id: If6277407a6a5a4da9e3ad01dc45f57a7fc9954e4
2015-12-11 18:15:41 -08:00
Elliott Hughes
44b6aefeeb
Remove fastboot/genkey.sh.
...
Some unknown cruft from the pre-cupcake era.
Change-Id: I8964892419cda9781d1506aa7006c51dc00ca33d
2015-12-11 17:57:53 -08:00
Josh Gao
412f6aaead
Merge "adb: handle some edge cases with process environments."
...
am: 80f3b0438d
* commit '80f3b0438d84fba3c36cc73cfef992032cd33eb0':
adb: handle some edge cases with process environments.
2015-12-11 16:49:30 -08:00
Josh Gao
80f3b0438d
Merge "adb: handle some edge cases with process environments."
2015-12-12 00:43:38 +00:00
Josh Gao
e03c988748
adb: handle some edge cases with process environments.
...
Change-Id: I0c20e58e14ef756a8c45dd5ea85f7301157a3c8e
2015-12-11 15:58:32 -08:00
Josh Gao
7b74dc83e6
Merge "adb: don\'t use setenv after forking."
...
am: 5e15568c07
* commit '5e15568c077e3c4df5218f78363864a6f7280c06':
adb: don't use setenv after forking.
2015-12-11 15:54:37 -08:00
Josh Gao
5e15568c07
Merge "adb: don't use setenv after forking."
2015-12-11 23:32:19 +00:00
Josh Gao
9b3fd67213
adb: don't use setenv after forking.
...
Previously, for `adb shell`, we were using setenv after forking to set
up the child's environment. This would occasionally deadlock in the
child, which would cause the main thread to deadlock waiting for the
child to complete. This patch constructs the environment before forking
and passes it to execle, eliminating the deadlock.
Bug: http://b/25847115
Change-Id: I720d472770564b1449819ddaab945a89844244a8
2015-12-11 15:10:12 -08:00
Mark Salyzyn
6a92853230
Merge "liblog: logprint security ANDROID_LOG_WARN"
...
am: d2d35df279
* commit 'd2d35df279bcc6535455459ba9bd6aff077b7ea3':
liblog: logprint security ANDROID_LOG_WARN
2015-12-11 14:11:14 -08:00
Tom Cherry
80625ed1c3
Merge "Update init documentation to reflect fs_config changes"
...
am: b11afd7741
* commit 'b11afd7741c5e939bf5c6fb47dcadc49e3664f32':
Update init documentation to reflect fs_config changes
2015-12-11 14:11:07 -08:00
Mark Salyzyn
d2d35df279
Merge "liblog: logprint security ANDROID_LOG_WARN"
2015-12-11 21:43:17 +00:00
Tom Cherry
b11afd7741
Merge "Update init documentation to reflect fs_config changes"
2015-12-11 21:23:12 +00:00
Tom Cherry
dbddb40c95
Update init documentation to reflect fs_config changes
...
Change-Id: I00296d90c44af369a51ecb5cbb667567328f0053
2015-12-11 13:20:38 -08:00
Josh Gao
8b99185552
Merge "adb: make pulling symlinks and devices work."
...
am: c8e793685c
* commit 'c8e793685c816531cd2f2af7229b3f6b41d14a7c':
adb: make pulling symlinks and devices work.
2015-12-11 13:17:53 -08:00
Josh Gao
c8e793685c
Merge "adb: make pulling symlinks and devices work."
2015-12-11 21:04:25 +00:00
Josh Gao
f264224191
adb: make pulling symlinks and devices work.
...
Bug: http://b/25972989
Bug: http://b/26085751
Change-Id: I43842871522ea5f67a8c258dcb6ddafa8dd744c8
2015-12-11 12:51:38 -08:00
Mark Salyzyn
7bc8023857
liblog: logprint security ANDROID_LOG_WARN
...
Bug: 26029733
Change-Id: I4f0cffc0a45819fb48807bf06ce336316276369d
2015-12-11 12:37:22 -08:00
Mark Salyzyn
72398c0515
Merge "logd: liblog: logcat: Add LOG_ID_SECURITY"
...
am: 86052a5d4f
* commit '86052a5d4f217a73c769c77f7ac0904b65e67942':
logd: liblog: logcat: Add LOG_ID_SECURITY
2015-12-11 09:41:29 -08:00
Mark Salyzyn
86052a5d4f
Merge "logd: liblog: logcat: Add LOG_ID_SECURITY"
2015-12-11 17:33:33 +00:00
Mike Frysinger
e2d0403e1c
Merge "adbd: refactor priv dropping logic"
...
am: 6945e36060
* commit '6945e360601a37301a6a678389d7bc9e974b1e23':
adbd: refactor priv dropping logic
2015-12-11 09:11:56 -08:00
Mike Frysinger
6945e36060
Merge "adbd: refactor priv dropping logic"
2015-12-11 17:03:19 +00:00
Mark Salyzyn
5afb3f5f67
Merge changes I598c8c5c,I672b0f4d,Id882978b,Idff5e080,Ib124eca1, ...
...
am: 30edbdce9b
* commit '30edbdce9bb5e76e02f5bdb1ee33cea2b62c7ceb':
logger.h: reduce maximum payload so sum is page size
liblog: test for maximum payload can not survive change
liblog: logprint use uid name if length less then 5
liblog: logprint add uid format modifier
liblog: readlog apps get logger_entry_v4 for pstore
logd: readlog apps get logger_entry_v4
logger.h: Add definition for logger_entry_v4
2015-12-11 08:59:38 -08:00
Mark Salyzyn
30edbdce9b
Merge changes I598c8c5c,I672b0f4d,Id882978b,Idff5e080,Ib124eca1, ...
...
* changes:
logger.h: reduce maximum payload so sum is page size
liblog: test for maximum payload can not survive change
liblog: logprint use uid name if length less then 5
liblog: logprint add uid format modifier
liblog: readlog apps get logger_entry_v4 for pstore
logd: readlog apps get logger_entry_v4
logger.h: Add definition for logger_entry_v4
2015-12-11 16:42:28 +00:00