Nick Kralevich
9f12f80d4a
am 18c9394c
: Merge "Add SELinux checks when adding a service."
...
* commit '18c9394ce1a4869eb5cf91eece02a4e944e2eebc':
Add SELinux checks when adding a service.
2014-06-12 21:06:37 +00:00
Mark Salyzyn
20914f0ad3
am a4e345e1
: Merge "sensorservice: 64-bit compile issues"
...
* commit 'a4e345e169fd9101011e358abdfb9308bc065bdb':
sensorservice: 64-bit compile issues
2014-06-12 16:09:59 +00:00
Nick Kralevich
18c9394ce1
Merge "Add SELinux checks when adding a service."
2014-06-12 03:32:07 +00:00
Riley Spahn
69154df9ef
Add SELinux checks when adding a service.
...
Add a MAC check to the svc_can_register function in
service_manager. The types are defined in
external/sepolicy/service.te and the mapping from service
names is defined in external/sepolicy/service_contexts.
Currently uses the property context backend to parse the
contexts file.
Bug: 12909011
Change-Id: I5d90a614263c60571c7c70c2882e6fa929911ca5
2014-06-12 20:46:24 +00:00
Mark Salyzyn
a4e345e169
Merge "sensorservice: 64-bit compile issues"
2014-06-12 03:32:07 +00:00
Wengang Wu
20071e5028
am e3d37a7b
: Enable support RGBX_8888 for omap3
...
* commit 'e3d37a7b55f86f5d005dd67f828dcf51fe60c0f6':
Enable support RGBX_8888 for omap3
2014-06-11 18:17:19 +00:00
Wengang Wu
e3d37a7b55
Enable support RGBX_8888 for omap3
...
Bug: 14995811
Change-Id: Iaeb5a5ad0e3bcf215613f24f2570ae0d8267c016
2014-06-11 11:13:40 -07:00
Calin Juravle
17e1d2ca97
am 7281ca65
: Merge "Pass --top-k-profile-threshold to dex2oat if available."
...
* commit '7281ca65d00171b846497abca357a005a401e16b':
Pass --top-k-profile-threshold to dex2oat if available.
2014-06-11 08:53:49 +00:00
Mark Salyzyn
db45861ff4
sensorservice: 64-bit compile issues
...
Change-Id: Ied7b779f39e71d041791729f7355b052b63903c5
2014-06-10 14:50:02 -07:00
Calin Juravle
7281ca65d0
Merge "Pass --top-k-profile-threshold to dex2oat if available."
2014-06-10 21:26:11 +00:00
Calin Juravle
4fdff46166
Pass --top-k-profile-threshold to dex2oat if available.
...
Also, don't pass --profile-file if the file is empty.
Bug: 12877748
Change-Id: I587d198e64da709930e2cea50a87fed1525281e5
2014-06-10 14:33:15 +01:00
Ying Wang
0cea0a2210
am d284c4cd
: Merge "Don\'t set LOCAL_MODULE_PATH for native tests."
...
* commit 'd284c4cd78e0d42a8ee7af6e8f61c5e66cae6318':
Don't set LOCAL_MODULE_PATH for native tests.
2014-06-09 23:00:04 +00:00
Ying Wang
d284c4cd78
Merge "Don't set LOCAL_MODULE_PATH for native tests."
2014-06-09 22:52:48 +00:00
Ying Wang
8baf4fcabd
Don't set LOCAL_MODULE_PATH for native tests.
...
The build system will set it up automatically.
Change-Id: Id5ed9eff88dab2349c3b357ee09f7da9479d7d2d
2014-06-09 15:23:46 -07:00
Mark Salyzyn
72676e7d0d
am 0e1313cd
: Merge "libgui: 64-bit compile issues"
...
* commit '0e1313cdb1d5d21e4d6123f77b4238f1c8c2d564':
libgui: 64-bit compile issues
2014-06-09 21:46:25 +00:00
Mark Salyzyn
0e1313cdb1
Merge "libgui: 64-bit compile issues"
2014-06-09 21:38:00 +00:00
Mark Salyzyn
911004506d
libgui: 64-bit compile issues
...
Change-Id: I29961c1567b8431518a7d032ea43385e23b7bb37
2014-06-09 14:27:45 -07:00
Robin Lee
04eb4227b0
am c4193f1f
: Merge "Migrate keychain directories to /data/misc/user/0"
...
* commit 'c4193f1fef52314b451f55cce48ce44f94b875b6':
Migrate keychain directories to /data/misc/user/0
2014-06-09 12:51:06 +00:00
Robin Lee
c4193f1fef
Merge "Migrate keychain directories to /data/misc/user/0"
2014-06-09 12:44:34 +00:00
Calin Juravle
fb617aa82a
am 06642342
: Merge "Don\'t always add profile-file option to dex2oat"
...
* commit '066423423f04bf1c5972b1d611e01e2e17df3727':
Don't always add profile-file option to dex2oat
2014-06-09 09:56:31 +00:00
Calin Juravle
066423423f
Merge "Don't always add profile-file option to dex2oat"
2014-06-09 09:15:09 +00:00
Jesse Hall
17cbadf0f5
am 6fa169fa
: Merge "Add aarch64 EGL/GLES trampolines"
...
* commit '6fa169faa955ecc47872557a5d4fd89a95190d5e':
Add aarch64 EGL/GLES trampolines
2014-06-07 00:16:33 +00:00
Jesse Hall
6fa169faa9
Merge "Add aarch64 EGL/GLES trampolines"
2014-06-06 23:49:41 +00:00
Jesse Hall
30a41aa1cc
Add aarch64 EGL/GLES trampolines
...
Change-Id: Ia90e18d26ff3bdb7e643aff8d77cbaddd2ac2a03
2014-06-06 16:31:53 -07:00
Calin Juravle
57c69c3964
Don't always add profile-file option to dex2oat
...
Add profile-file option to dex2oat only if the profiler is active and
the file exists.
Bug: 12877748
Bug: 15275634
Change-Id: Icef76514c912c88311ed108f2be7a6329131f741
2014-06-06 15:13:06 +01:00
Narayan Kamath
0c96c35fe4
am e86420e3
: (-s ours) Merge "Fix flattening/unflattening of android::Sensor."
...
* commit 'e86420e399993e0f49e5d7733b5fc87eb9fe179b':
Fix flattening/unflattening of android::Sensor.
2014-06-06 10:33:18 +00:00
Narayan Kamath
e86420e399
Merge "Fix flattening/unflattening of android::Sensor."
2014-06-06 10:05:09 +00:00
Robin Lee
53b4926828
am 8adb5a82
: Merge "Add installd command to create /data/misc user dir"
...
* commit '8adb5a822d44ed43aa0ec9a8948a7820fdfcd375':
Add installd command to create /data/misc user dir
2014-06-05 17:53:31 +00:00
Robin Lee
07053fcb61
Migrate keychain directories to /data/misc/user/0
...
With new CA certificates being stored in /data/misc/user/<userid>/
existing ones need to be moved into the same place.
After this update only the owner user will have custom trusted CAs; all
other users will revert to the default set.
Change-Id: I14a4cd6048685902ad5dd3b53494b03fadc41c04
2014-06-05 17:35:50 +00:00
Robin Lee
8adb5a822d
Merge "Add installd command to create /data/misc user dir"
2014-06-05 17:18:23 +00:00
Robin Lee
095c763dd9
Add installd command to create /data/misc user dir
...
New command 'mkuser <id>' sets up a user directory in /data/misc/user/,
readable by all apps within that user and writeable by the local system
process.
Change-Id: I5ddde8c4a80f606e723bb41aa64581a0720842d5
2014-06-05 14:34:15 +00:00
Narayan Kamath
c2ac5897ec
am 065e9c86
: Merge "Fix mips build for libbinder."
...
* commit '065e9c86e249beac08783c7e9334d5709e2c9080':
Fix mips build for libbinder.
2014-06-04 17:28:38 +00:00
Narayan Kamath
065e9c86e2
Merge "Fix mips build for libbinder."
2014-06-04 14:53:08 +00:00
Narayan Kamath
2f1f742b90
Fix mips build for libbinder.
...
Mips specific code was using an uninitialized variable.
(cherry picked from commit 2c68d380c9
)
Change-Id: I6b562b3f6d2084b72e747736cbf43684c2049f8e
2014-06-04 15:34:16 +01:00
Mark Salyzyn
f0a2475905
am a28750ee
: Merge "binder: Turn on -Werror"
...
* commit 'a28750eec38c848230adfeef28725b29cc36a9da':
binder: Turn on -Werror
2014-06-03 20:48:35 +00:00
Mark Salyzyn
a28750eec3
Merge "binder: Turn on -Werror"
2014-06-03 19:40:01 +00:00
Mark Salyzyn
d4ecccfd20
binder: Turn on -Werror
...
Change-Id: I0ee785927a7ae5f731b02176b0b781b87c22a24e
2014-06-03 11:11:45 -07:00
Narayan Kamath
26063a9155
am f1dd859b
: Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
...
* commit 'f1dd859baa114995bcbcfb7119e939d0b4f45ed5':
x86_64: Align uint64_t/int64_t structure member to 8 bytes
2014-06-03 13:29:00 +00:00
Narayan Kamath
f1dd859baa
Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
2014-06-03 10:06:55 +00:00
Narayan Kamath
403ec9f15a
Fix flattening/unflattening of android::Sensor.
...
Write string lengths as uint32_t so that their width is
the same on 32 and 64 bit processes.
Note that this fixes another bug as a side effect; getFlattenedSize
was assuming that sizeof(uint32_t) == sizeof(size_t).
Change-Id: I7b6e3993e1f1ac45c14832ce59c59e0772855a2f
2014-05-30 14:40:13 +01:00
Fengwei Yin
83e0e425c6
x86_64: Align uint64_t/int64_t structure member to 8 bytes
...
To make sure the stature which pass between 32/64bit process have
same memory layout for 32/64bit.
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
Co-Authored-by: Narayan Kamath <narayan@google.com> (Unit test only.)
Change-Id: I1bc2d12cce41ec0bc484adcaf968f274bec75c12
2014-05-30 14:13:29 +01:00
Mark Salyzyn
ea3f1da901
am 1ce5ecbe
: am 63645c69
: Merge "binder: rm utils/Debug.h"
...
* commit '1ce5ecbe3286380f5ff7ace289369ed006e9b40a':
binder: rm utils/Debug.h
2014-05-29 21:06:36 +00:00
Mark Salyzyn
1ce5ecbe32
am 63645c69
: Merge "binder: rm utils/Debug.h"
...
* commit '63645c69e03cf3862c52cfde6cbd5f5143ccd38a':
binder: rm utils/Debug.h
2014-05-29 20:29:32 +00:00
Mark Salyzyn
63645c69e0
Merge "binder: rm utils/Debug.h"
2014-05-29 20:26:49 +00:00
Mark Salyzyn
317ff37cf7
binder: rm utils/Debug.h
...
Change-Id: I16931919a26c16a0d701771c93fa7fe1c6f60ef8
2014-05-29 13:10:03 -07:00
Brian Carlstrom
823bcce3ab
am 4ae6a267
: am f3e4fda0
: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
...
* commit '4ae6a26719feb21b7fa1cc5f307b591858a30f26':
Remove dependencies on runtime_libdvm and libdvm.so in general
2014-05-29 19:43:02 +00:00
Brian Carlstrom
4ae6a26719
am f3e4fda0
: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
...
* commit 'f3e4fda09106cb93bddea35a2cc7dbd4b2c281e9':
Remove dependencies on runtime_libdvm and libdvm.so in general
2014-05-29 19:39:48 +00:00
Brian Carlstrom
f3e4fda091
Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
2014-05-29 19:36:41 +00:00
Simon Wilson
ad8d25e812
am 90654afb
: Revert "Enable OMAP4 SGX workaround for OMAP3 too"
...
* commit '90654afb3aeac78916f2a53fe689a087c0e283c9':
Revert "Enable OMAP4 SGX workaround for OMAP3 too"
2014-05-29 17:54:34 +00:00
Brian Carlstrom
617f974e63
Remove dependencies on runtime_libdvm and libdvm.so in general
...
Bug: 14298175
(cherry picked from commit aefe55f0fb
)
Change-Id: I05b1a7dd1ef30b3366b52b46bfc7b39cfb3be198
2014-05-29 09:39:26 -07:00