Jesse Hall
b0f96c4881
am 01502981
: Merge "fix valgrind ioctl warning."
...
* commit '01502981cddb69b9ab7e4bf8bc66366ae0eb7035':
fix valgrind ioctl warning.
2014-03-20 16:31:17 +00:00
Jesse Hall
01502981cd
Merge "fix valgrind ioctl warning."
2014-03-20 16:09:15 +00:00
Nick Kralevich
bca88f10c9
am 1bf30245
: Merge "Extend installd to support SELinux restorecon function."
...
* commit '1bf30245cbb8be7279fadcf4071cecc8db91789f':
Extend installd to support SELinux restorecon function.
2014-03-19 20:29:46 +00:00
Nick Kralevich
1bf30245cb
Merge "Extend installd to support SELinux restorecon function."
2014-03-19 20:17:24 +00:00
Robert Craig
e9887e46ce
Extend installd to support SELinux restorecon function.
...
Implement new restorecondata function which will allow
the relabeling of /data/data and /data/user directories.
This is needed in the case of certain OTAs. Not every
boot will apply this relabeling however. Consult change
I77bf2a0c4c34b1feef6fdf4d6c3bd92dbf32f4a1 for
clarification on this issue.
Change-Id: I05e8b438950ddb908e46c9168ea6ee601e6d674f
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-03-19 17:37:48 +00:00
Kenny Root
9ff2aad010
am 5b61ad2c
: Check the padded size of the read byte array
...
* commit '5b61ad2cda8ec8ab634ce02f388bb2d3c5ab048d':
Check the padded size of the read byte array
2014-03-17 21:28:33 +00:00
Kenny Root
5b61ad2cda
Check the padded size of the read byte array
...
Bug: 13509200
Change-Id: Id93894fcc617ec1cd4ce66921c6e1f1c3cf40b09
2014-03-17 13:18:16 -07:00
Marco Nelissen
446ef4bae2
am f0190bff
: Add support for writing byte arrays to parcels
...
* commit 'f0190bff38b6c29abbfc4a877442f71fc3d7dad8':
Add support for writing byte arrays to parcels
2014-03-14 23:32:45 +00:00
Mark Salyzyn
c45011f272
am cdbf28b3
: Merge "native frameworks: 64-bit compile issues"
...
* commit 'cdbf28b3f7f5327f4cb0eb95b8326bf4c24c87ba':
native frameworks: 64-bit compile issues
2014-03-13 23:18:43 +00:00
Marco Nelissen
f0190bff38
Add support for writing byte arrays to parcels
...
b/13418320
Change-Id: I2285df9e9d3dc8a6a54055b13b352b81660bf45d
2014-03-13 14:17:40 -07:00
Mark Salyzyn
cdbf28b3f7
Merge "native frameworks: 64-bit compile issues"
2014-03-13 15:20:45 +00:00
Anwar Ghuloum
f4b08ebc61
am 06ed9491
: Merge "Fix parameter ordering for installd\'s dex2oat execl."
...
* commit '06ed9491418ce84e4272bf4201545fa6cfe3932e':
Fix parameter ordering for installd's dex2oat execl.
2014-03-13 03:43:10 +00:00
Mark Salyzyn
92dc3fc52c
native frameworks: 64-bit compile issues
...
- Fix format (print/scanf)
- Suppress unused argument warning messages (bonus)
Change-Id: I05c7724d2aba6da1e82a86000e11f3a8fef4e728
2014-03-12 13:12:44 -07:00
Anwar Ghuloum
06ed949141
Merge "Fix parameter ordering for installd's dex2oat execl."
2014-03-11 23:11:02 +00:00
Anwar Ghuloum
4bc054019d
Fix parameter ordering for installd's dex2oat execl.
...
Change-Id: Ibd6fd46c6ec3137874f9a3d5eea134bc804e039a
2014-03-11 15:42:58 -07:00
Dave Allison
7ccff3f7f2
am 1649c77e
: Merge "ART profiler"
...
* commit '1649c77ed29eada5de32ace97033b9d898e9a6eb':
ART profiler
2014-03-11 18:51:44 +00:00
Greg Hackmann
645427aeac
am 112aa42e
: Merge "SurfaceFlinger: fix 64-bit format string warnings"
...
* commit '112aa42e91b4bb0cde334753e2ad05e3f248b377':
SurfaceFlinger: fix 64-bit format string warnings
2014-03-11 18:51:43 +00:00
Mathieu Chartier
b80b1f8445
am 3c39e03c
: Merge "Don\'t pass in empty arg to dex2oat."
...
* commit '3c39e03c08094ce65608cae8a45dd726cf10b5c3':
Don't pass in empty arg to dex2oat.
2014-03-11 18:30:06 +00:00
Brian Carlstrom
672d967438
am e19c99aa
: Merge "Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags"
...
* commit 'e19c99aad605c395f53bf39ae1a27e298e7e33ce':
Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags
2014-03-11 18:29:53 +00:00
Igor Murashkin
a9a80939a7
am 462fb3a8
: Merge "gui: Fix return code assert in CpuConsumer_test."
...
* commit '462fb3a8d597fffef3d5534544428d5cee9d8c16':
gui: Fix return code assert in CpuConsumer_test.
2014-03-11 18:29:24 +00:00
Mark Salyzyn
11b8885445
am 61d6a008
: Merge "hwc test: 64-bit compilation error"
...
* commit '61d6a00895d2e8b9085278d0acbf98c19e7d6ed5':
hwc test: 64-bit compilation error
2014-03-11 18:29:15 +00:00
Ying Wang
b1078ae88d
am 6b4e5b7f
: Merge "Fix misuse of ."
...
* commit '6b4e5b7f856c32b75e9a22df4c3f2273ae906acb':
Fix misuse of $(my-dir).
2014-03-11 18:17:36 +00:00
Narayan Kamath
3995b20170
am b98c4761
: Merge "Correcting include path in installd test project\'s Android.mk"
...
* commit 'b98c4761e0c80a8d8138910e0a5e5fc8baff8282':
Correcting include path in installd test project's Android.mk
2014-03-11 18:17:00 +00:00
Narayan Kamath
cd29bbef6d
am 93e6a48b
: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
...
* commit '93e6a48b3e876708a8161a9946581f5e8ebb382f':
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
2014-03-11 18:16:18 +00:00
Jesse Hall
7bc5aa8905
am c9bf3ba4
: Merge "Virtual Display async mode is overridden"
...
* commit 'c9bf3ba411c66dd1d977c81f1aca08109cbf8c86':
Virtual Display async mode is overridden
2014-03-11 17:12:15 +00:00
Narayan Kamath
8cf113a3e5
am aaa27fd5
: Merge "Use reinterpret_cast when an integer is cast to a pointer"
...
* commit 'aaa27fd5a0bb81ac17c25c33beb2656b32100cd6':
Use reinterpret_cast when an integer is cast to a pointer
2014-03-11 00:53:05 +00:00
Narayan Kamath
6622f3abc1
am e5c99bf3
: Merge "Use long for pointers in opengl/EGL classes"
...
* commit 'e5c99bf38001d86ca41dfc51fac337aa6a6931f4':
Use long for pointers in opengl/EGL classes
2014-03-11 00:53:05 +00:00
Arve Hjønnevåg
04966baf69
am ead79b83
: (-s ours) Merge "Binder: Make sure binder objects do not overlap"
...
* commit 'ead79b8365ea33eb0e21a817d5ca563ee1eb56be':
Binder: Make sure binder objects do not overlap
2014-03-11 00:52:51 +00:00
Arve Hjønnevåg
614019cd1f
am d1c87d37
: Merge changes I3432d9d3,I90fcf538,I64398603
...
* commit 'd1c87d37025c49f6a47fe43328572da495ff04c1':
Binder: Fix some valgrind errors.
Binder: Don't cast directly from a pointer to binder_uintptr_t
Binder: Disable attemptIncStrongHandle
2014-03-10 18:06:10 +00:00
Narayan Kamath
4ef023e9eb
am 9076fa78
: Merge "Update EGL codegen to be in sync with frameworks/base"
...
* commit '9076fa78d2541fa14253aaf08e6445fafa17e35b':
Update EGL codegen to be in sync with frameworks/base
2014-03-08 01:51:14 +00:00
Narayan Kamath
2f5a887ebf
am f56ae199
: Merge "Update GLES codegen to be in sync with frameworks/base"
...
* commit 'f56ae1999948393ba8c207525d6466ee424c4467':
Update GLES codegen to be in sync with frameworks/base
2014-03-08 01:51:14 +00:00
Colin Cross
40d580710b
am 6b4ecf31
: Merge "surfaceflinger: add BoardConfig.mk variable to force 32-bit"
...
* commit '6b4ecf314461067c0e05130edaf785fb010f471a':
surfaceflinger: add BoardConfig.mk variable to force 32-bit
2014-03-07 23:19:26 +00:00
Dave Allison
1649c77ed2
Merge "ART profiler"
2014-03-07 22:25:35 +00:00
Greg Hackmann
112aa42e91
Merge "SurfaceFlinger: fix 64-bit format string warnings"
2014-03-07 21:47:30 +00:00
Greg Hackmann
86efcc0cbc
SurfaceFlinger: fix 64-bit format string warnings
...
Change-Id: Idacfbf0601743fba1c5de7632201a66a307a2710
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-03-07 12:45:13 -08:00
Dave Allison
d93707342a
ART profiler
...
Add args to the installd commands for profiler usage.
Make installd create the profile files and allow apps
to write to them.
The profile files are in /data/dalvik-cache/profiles. This
central location is needed due to permissions issues with
dex2oat reading from an app's data directory. The solution
is to put the profile file in a directory owned by the
install user and make the file writeable by the shared group
id of for the app. The app can read and write to these files
only in the profiles directory. The 'system' user also needs
to be able to read the files in order to determine the amount
of change to the file over time.
Bug: 12877748
Change-Id: I9b8e59e3bd7df8a1bf60fa7ffd376a24ba0eb42f
Conflicts:
cmds/installd/commands.c
2014-03-07 12:35:52 -08:00
Colin Cross
9a79ba8031
am 913a17fd
: Merge "libagl: support multilib build"
...
* commit '913a17fd5f8cabbc73ff46db15b4b53b9aeba7b8':
libagl: support multilib build
2014-03-07 19:39:58 +00:00
Colin Cross
3724c30881
am d5fe844b
: Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries"
...
* commit 'd5fe844b41778bf87101fc0a0e4e37e779678c50':
Use /(vendor|system)/lib64/egl for 64-bit EGL libraries
2014-03-07 19:39:55 +00:00
Dianne Hackborn
9cc9e7cd58
am 7d86b454
: Merge "frameworks/native: move idmap to frameworks/base"
...
* commit '7d86b45472898373bbe3ef03286b66d71ea82b79':
frameworks/native: move idmap to frameworks/base
2014-03-07 19:33:38 +00:00
Aravind Akella
3eb91b7ede
am 19d64819
: Bug fix for SensorFusion data rate.
...
* commit '19d648195673b106152610e3787c95886946460f':
Bug fix for SensorFusion data rate.
2014-03-07 18:30:46 +00:00
Nick Kralevich
d9da227e79
am 2044ac43
: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
...
* commit '2044ac43e53b517526b3c70dc4fbc60ffc01693f':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-03-07 02:29:31 +00:00
Dianne Hackborn
c43da752a7
am 6c14f0ad
: Merge "Runtime resource overlay, iteration 2"
...
* commit '6c14f0ad82be418c742e56fe586657ea0f394b05':
Runtime resource overlay, iteration 2
2014-03-07 02:27:06 +00:00
Dianne Hackborn
8fb86e7d45
am 340aa8cb
: Merge "New command line tool \'idmap\'"
...
* commit '340aa8cbd4afbb68b16f369336cc1c202582f021':
New command line tool 'idmap'
2014-03-07 02:27:02 +00:00
Colin Cross
8ff043d3fb
am 74be0f7b
: Merge "binder: fix all warnings"
...
* commit '74be0f7be35e7b40a322fa9a407cb49265333a0b':
binder: fix all warnings
2014-03-07 02:23:38 +00:00
Andrew Hsieh
01769ef9e0
am 055dac1b
: Merge "Fixed apparent copy/paste mistake Bug: 11634373"
...
* commit '055dac1b54af46a0608b32e83fcae45e75a4a8f0':
Fixed apparent copy/paste mistake Bug: 11634373
2014-03-07 02:23:17 +00:00
Siva Velusamy
11ba57f7d5
am fd6a3ff4
: Merge "GLES_trace: fix compile errors on 64 bit architectures"
...
* commit 'fd6a3ff4b4dda34f8e6e03989dd7466e4cbd8b0e':
GLES_trace: fix compile errors on 64 bit architectures
2014-03-07 01:35:47 +00:00
Arve Hjønnevåg
72e7ac9ba4
am 4e7fd950
: Merge "Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set."
...
* commit '4e7fd9506103dcc9750788caf1f94b8d1348f37b':
Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set.
2014-03-07 01:35:23 +00:00
Arve Hjønnevåg
eea5b29842
am 58242fc2
: Merge changes Ib0e5a037,I1bd7c38e,Icfc67c2a,I96c64312,I59528054, ...
...
* commit '58242fc29881cf29d56ee6e5fde6d73b16d0b67c':
ServiceManager: Implement PING_TRANSACTION
ServiceManager: Use 32/64 bit types from new binder header
Binder: Use 64 bit pointers in 32 processes if selected by the target
Add BINDER_IPC_32BIT to CFLAGS unless TARGET_USES_64_BIT_BINDER is true
Binder: Make binder portable
ServiceManager: Fix the binder interface
ServiceManager: Store handles in uint32_t instead of void *
ServiceManager: Generic Fixes
ServiceManager: Add extra error handling
ServiceManager: Fix Android.mk
ServiceManager: Make use of kernel exported structures
2014-03-07 01:34:26 +00:00
Brian Carlstrom
08732ff438
am af3efe8c
: Merge "frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default"
...
* commit 'af3efe8ce7e2eeb7a98552af5cf38d8a9720f018':
frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default
2014-03-07 00:37:20 +00:00
Aravind Akella
19d6481956
Bug fix for SensorFusion data rate.
...
SensorFusion is always returning data at the slowest possible sampling rate (5 Hz). batch() is getting called twice, first time with the requested rate and second time with the slowest rate (which overwrites the requested rate). Fix batch call in SensorFusion::activate()
Bug: 12064319
Change-Id: If62f3e514233f69810336fd22b136b4395b667d3
(cherry picked from commit 8850909038
)
2014-03-06 19:07:18 +00:00