Nick Kralevich
2a8bb978d5
am 51eec3b9
: Merge "Fix relabeling of secondary user package directories."
...
* commit '51eec3b98788039afc5fd7ffe76612c7f8d9b39c':
Fix relabeling of secondary user package directories.
2014-09-08 20:55:32 +00:00
Stephen Smalley
8ac2a648b6
Fix relabeling of secondary user package directories.
...
When relabeling secondary user package directories, we need to use
the uid of the directory rather than the primary package UID;
otherwise, levelFrom=user will not work correctly.
Change-Id: I0d76ec6ec6fe56a566023ca5e1398efdf28fc81e
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-09-08 15:51:55 -04:00
Brian Carlstrom
ad2a4083fe
am 8c1642ad
: Merge "Remove obsolete prunedexcache"
...
* commit '8c1642ad4ea8fbeb7d03f30e5f50e03c28d40065':
Remove obsolete prunedexcache
2014-08-29 11:39:54 +00:00
Alex Light
8b17ac6bd6
Remove obsolete prunedexcache
...
Bug: 16875245
(cherry picked from commit 5f727f8694
)
Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893
2014-08-28 16:54:54 -07:00
Alex Light
5f727f8694
Remove obsolete prunedexcache
...
Bug: 16875245
Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893
2014-08-28 23:30:52 +00:00
Jeff Sharkey
18a9457edd
am 7903c6a2
: Merge "Make clear data stricter." into lmp-dev
...
* commit '7903c6a263354506ace10fc32aa65c231b64f62b':
Make clear data stricter.
2014-08-27 18:26:20 +00:00
Jeff Sharkey
7903c6a263
Merge "Make clear data stricter." into lmp-dev
2014-08-27 17:58:35 +00:00
Jeff Sharkey
3316fe472f
Make clear data stricter.
...
It should nuke everything under the data directory. PMS will come
around and generate the lib symlink after we're finished.
Bug: 16739202
Change-Id: Ib70af2e1450e3bed6781fb497b9cc67e1e594c49
2014-08-27 10:46:28 -07:00
Calin Juravle
7330016a75
am 97477d20
: Set compiler filter flag to true when vmSafeMode is present.
...
* commit '97477d203eaf0c3235bbe2415356f20a0431cada':
Set compiler filter flag to true when vmSafeMode is present.
2014-08-27 16:33:27 +00:00
Calin Juravle
4f60ac2bbc
Add vm_safe_mode to dexopt.
...
The flag enforces interpret-only flag for dex2oat.
Bug: 12457423
(cherry picked from commit b1efac1035
)
(cherry picked from commit 97477d203e
)
Change-Id: I215339527e998b24e274c8df42a5024839e6a9fa
2014-08-27 16:16:05 +01:00
Calin Juravle
97477d203e
Set compiler filter flag to true when vmSafeMode is present.
...
Bug: 12457423
Change-Id: I33345c5cce76681d8a6592ebae8c9f96a9f0f8bd
2014-08-27 16:10:03 +01:00
Calin Juravle
2d509c0113
am 7de2bde3
: Merge "Add vm_safe_mode to dexopt." into lmp-dev
...
* commit '7de2bde3c4c3a6ecc7e6f21e3f3322688b718c4a':
Add vm_safe_mode to dexopt.
2014-08-26 19:28:57 +00:00
Calin Juravle
7de2bde3c4
Merge "Add vm_safe_mode to dexopt." into lmp-dev
2014-08-26 19:10:06 +00:00
Calin Juravle
188fb813c1
am 20558f11
: Merge "Pass isa features flag to dex2oat." into lmp-dev
...
* commit '20558f1154abcf3360fd972f6d2c80bb80f78502':
Pass isa features flag to dex2oat.
2014-08-26 17:51:57 +00:00
Calin Juravle
e9eb12c291
Pass isa features flag to dex2oat.
...
Bug: 16716262
(cherry picked from commit 8fc7315a67
)
Change-Id: I3cb1d82604612bc7212bcbdeef685bc05b695b6a
2014-08-26 18:48:30 +01:00
Calin Juravle
20558f1154
Merge "Pass isa features flag to dex2oat." into lmp-dev
2014-08-26 17:34:57 +00:00
Calin Juravle
b1efac1035
Add vm_safe_mode to dexopt.
...
The flag enforces interpret-only flag for dex2oat.
Bug: 12457423
Change-Id: Ifdafcc1afa32996577fa44c5682eeb58c79772ac
2014-08-26 18:10:40 +01:00
Calin Juravle
8fc7315a67
Pass isa features flag to dex2oat.
...
Bug: 16716262
Change-Id: Ifbc3a1520bc177aa87855edb60c36346f24c77cd
2014-08-26 18:10:36 +01:00
Andres Morales
03d45ded3c
am 47c166a9
: Merge "Fix deadlock when killing adb bugreport" into lmp-dev
...
* commit '47c166a9ad740707f86719e0de56e20c73f407c1':
Fix deadlock when killing adb bugreport
2014-08-25 17:49:18 +00:00
Andres Morales
47c166a9ad
Merge "Fix deadlock when killing adb bugreport" into lmp-dev
2014-08-25 17:31:50 +00:00
Andres Morales
2e671bbdb7
Fix deadlock when killing adb bugreport
...
Leave default signal handler (terminate) for parent process,
add SIG_IGN as signal handler for children and let them
go down when the parent gets SIGPIPE.
Bug: 17109154
Change-Id: Id33db3e97a32f289eb2a9a1a0ca8acbe3dcd285d
2014-08-22 12:10:44 -07:00
Calin Juravle
01f481649d
am c597b6dd
: Fix validation of system paths in installd.
...
* commit 'c597b6dd895dbb2b28c757ce7a2651b3cdc9b00c':
Fix validation of system paths in installd.
2014-08-22 14:54:28 +00:00
Calin Juravle
f53c08befc
Fix validation of system paths in installd.
...
System apps are now installed under their own directory
(system_app_dir/app_dir/app.apk). The new path doesn't pass installd
validation because of obsolete checks which verify that the path does
not contain subdirectories past the system_app_dir.
The CL fixes the validation to accept at most on subdirectory.
Bug: 17109858
(cherry picked from commit c597b6dd89
)
Change-Id: Ic5f15d1864c6af9f4c4b07dc27244ebbb521ad5e
2014-08-22 15:33:30 +01:00
Calin Juravle
c597b6dd89
Fix validation of system paths in installd.
...
System apps are now installed under their own directory
(system_app_dir/app_dir/app.apk). The new path doesn't pass installd
validation because of obsolete checks which verify that the path does
not contain subdirectories past the system_app_dir.
The CL fixes the validation to accept at most on subdirectory.
Bug: 17109858
Change-Id: I13abb52c0016610ff436f6a26bb6b3b85dc4dfb0
2014-08-22 14:52:53 +01:00
Calin Juravle
c542d1141d
am 67cfe0c0
: Merge "Allow apk path to contain one subdirectory." into lmp-dev
...
* commit '67cfe0c0660c36ca385ad0eeb1352a2df721b49c':
Allow apk path to contain one subdirectory.
2014-08-22 13:15:53 +00:00
Calin Juravle
9d76156266
Allow apk path to contain one subdirectory.
...
In the current directory layout this prevented rm_dex and move_dex
commands to validate the apk path and thus cleaning up resources.
Bug: 16888084
(cherry picked from commit fd88ff2edd
)
Change-Id: I1002529b0c35852c67540d3165d1444523460592
2014-08-22 14:04:45 +01:00
Calin Juravle
67cfe0c066
Merge "Allow apk path to contain one subdirectory." into lmp-dev
2014-08-22 12:58:11 +00:00
Colin Cross
368e2eceb7
am 61a4eecb
: Merge "atrace: avoid unnecessary writes to trace_clock" into lmp-dev
...
* commit '61a4eecbe615bc94944161c4cf4aa590dfca1b2e':
atrace: avoid unnecessary writes to trace_clock
2014-08-21 03:06:23 +00:00
Calin Juravle
fd88ff2edd
Allow apk path to contain one subdirectory.
...
In the current directory layout this prevented rm_dex and move_dex
commands to validate the apk path and thus cleaning up resources.
Bug: 16888084
Change-Id: Iba579d075a9c6d7de047e7ffef95441498257086
2014-08-20 15:37:54 +01:00
Colin Cross
b1ce49b2ed
atrace: avoid unnecessary writes to trace_clock
...
Writing to trace_clock erases the trace buffer, even if the value
hasn't changed. This prevents use of --async_start and --async_dump
to leave background tracing running and dump after an even that
needs debugging, because --async_dump writes to trace_clock and
resets the buffer before it can read it.
Read and parse the current value from trace_clock before writing,
and skip the write if the value isn't changing.
Change-Id: Ia2ec5bb654fb0bd179771b511ff261731ba47dca
2014-08-20 14:28:47 -07:00
Colin Cross
7477a8a0a3
am b1f0f288
: Merge changes I4cfb3138,I45356c29 into lmp-dev
...
* commit 'b1f0f288e30c0448cabd46d19c60b3bd0d272f74':
atrace: add memory reclaim tracing
atrace: Add IRQ events
2014-08-19 01:48:59 +00:00
Colin Cross
580407f107
atrace: add memory reclaim tracing
...
Add "memreclaim" to trace direct reclaim, shrink slab cycles, and
kswapd waking up and sleeping.
Change-Id: I4cfb313820a3a9aa5a9d07a39c42db41c24304a6
2014-08-18 17:48:16 -07:00
Dan Willemsen
f440d398fa
atrace: Add IRQ events
...
Add "irq" to trace irq and softirq events.
Change-Id: I45356c2912a1fa130667ada7b21e9fb54ddcfba5
2014-08-18 17:47:56 -07:00
Jeff Brown
9612a31003
am c8c5e4c6
: Merge "Add trace tag for power management." into lmp-dev
...
* commit 'c8c5e4c66b858fc41bdb696421eb13c3ea65a238':
Add trace tag for power management.
2014-08-16 03:14:00 +00:00
Jeff Brown
c8c5e4c66b
Merge "Add trace tag for power management." into lmp-dev
2014-08-15 21:23:40 +00:00
Brian Carlstrom
46ab27e624
am e18987ef
: Disable verification based on vold.decrypt. [frameworks/native]
...
* commit 'e18987efb5e39ca1bed15527b7b82bde55c99669':
Disable verification based on vold.decrypt. [frameworks/native]
2014-08-15 17:20:38 +00:00
Brian Carlstrom
e18987efb5
Disable verification based on vold.decrypt. [frameworks/native]
...
Bug: 15165413
Change-Id: Ie70bf4e1348b7b8b2454cf9b498b272416d61c34
2014-08-15 09:57:55 -07:00
Brian Carlstrom
f7765c4a17
Disable verification based on vold.decrypt. [frameworks/native]
...
Bug: 15165413
(cherry picked from commit e18987efb5
)
Change-Id: Ie55ef400c9d1f231b3be64248c756ac798a11ffe
2014-08-15 10:05:32 -07:00
Jeff Brown
3200b0bf50
Add trace tag for power management.
...
Also added a couple of other existing missing tags in atrace.
Bug: 17004602
Change-Id: I6f697a2a15922bd4695acfa203d45eaae40cd00e
2014-08-14 19:24:47 -07:00
Andreas Gampe
f12e678d4b
am 1a22eb7b
: Merge "Change an accidental ALOGE to an ALOGV"
...
* commit '1a22eb7ba1062ed1ee35cdb9d797019699cbce8b':
Change an accidental ALOGE to an ALOGV
2014-08-11 20:00:46 +00:00
Andreas Gampe
1a22eb7ba1
Merge "Change an accidental ALOGE to an ALOGV"
2014-08-11 18:01:48 +00:00
Narayan Kamath
93b1b9a42c
am 82e98c21
: Merge "Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup"
...
* commit '82e98c21f8606e0de8c6beb4372bc4ae9f52b515':
Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup
2014-08-11 17:36:11 +00:00
Brian Carlstrom
3b14e5b1f3
Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup
...
Bug: 15927194
(cherry picked from commit 0378aaf257
)
Change-Id: I462b5ac256c4d091ed4023cf4b97dd6a4abcaa5f
2014-08-11 18:31:03 +01:00
Alex Light
a7915d437c
Change an accidental ALOGE to an ALOGV
...
Change-Id: If07bcef597dd9e531ce6d92c7780ba6ad5090f9a
2014-08-11 10:07:02 -07:00
Brian Carlstrom
0378aaf257
Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup
...
Bug: 15927194
Change-Id: Id8bc188de68d62fd5f91a99aaaa6c8f2dea06abd
2014-08-08 22:10:06 -07:00
Brian Carlstrom
41cd9eb424
Disable compilation based on vold.decrypt. [frameworks/native]
...
Bug: 15165413
(cherry picked from commit 538998f204
)
Change-Id: Idae36efa1cb3fb99b51fa0a79b6bb037981d1c71
2014-08-06 21:59:35 -07:00
Brian Carlstrom
9a87db6e1f
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]
...
This will allow us to conditionally change the compiler-filter based on other properties.
Bug: 15165413
(cherry picked from commit cf51ba1360
)
Change-Id: I6613c9710878d56ed8c121e0caded76a64430f76
2014-08-06 21:59:32 -07:00
Alex Light
43c5d30795
Make system use patchoat to relocate during runtime.
...
Make installd understand a patchoat directive and carry it out.
Bug: 15358152
(cherry picked from commit 7365a10689
)
Change-Id: Id84a15e626ddde63876914068d3d9aa037abc65b
2014-08-06 16:27:55 -07:00
Brian Carlstrom
021843c78d
am 8ce28672
: Merge "Make system use patchoat to relocate during runtime."
...
* commit '8ce28672106956eeff6d0ed2d1d826ec192e58ee':
Make system use patchoat to relocate during runtime.
2014-08-05 21:00:09 +00:00
Alex Light
7365a10689
Make system use patchoat to relocate during runtime.
...
Make installd understand a patchoat directive and carry it out.
Bug: 15358152
Change-Id: Ibe92d8b55a24bbf718b0416a21b76e5df7a2de26
2014-08-05 10:22:10 -07:00
Brian Carlstrom
755d35f5fa
am 74b3ecf4
: Merge "Disable compilation based on vold.decrypt. [frameworks/native]"
...
* commit '74b3ecf485254d8cb4ae2b1d4d5221454738a58d':
Disable compilation based on vold.decrypt. [frameworks/native]
2014-08-04 18:37:31 +00:00
Brian Carlstrom
6461ddb4e1
am 9c49e21d
: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]"
...
* commit '9c49e21d80cb55b7d77fdf118f06b88100141678':
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]
2014-08-04 18:37:26 +00:00
Brian Carlstrom
538998f204
Disable compilation based on vold.decrypt. [frameworks/native]
...
Bug: 15165413
Change-Id: Ibc39ab82e02e42345c6e2667ac45884f2e0cf7a4
2014-08-04 11:25:45 -07:00
Lorenzo Colitti
d4c3d38957
Improve network connectivity dumping.
...
1. Explicitly dump IP addresses.
Currently, some IP addresses are dumped using netcfg, but that
only dumps the first IPv4 address on each interface. Instead,
call ip -4 addr and ip -6 addr explicitly to dump all IPv4 and
IPv6 addresses on the system.
2. Disable dumping /proc/net/{ipv6,}route, because:
- We already dump all IPv4 and IPv6 routes in the tables that
we use.
- /proc/net/route is confusing because it only includes routes
in the main table, which are all but unused. It's also in
unreadable host-byte-order hex.
- /proc/net/ipv6_route is confusing because it includes routes
from all tables but does not say what table they are in.
3. Instead of dumping the contents of /proc/net/arp , use
"ip -4 neigh show" and "ip -6 neigh show" to dump the
neighbour caches for both IPv4 and IPv6.
Bug: 16663736
Change-Id: Id3e509b877ab7b00eb2399b6a9868b12245da2f0
2014-07-31 01:56:12 +00:00
Brian Carlstrom
cf51ba1360
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]
...
This will allow us to conditionally change the compiler-filter based on other properties.
Bug: 15165413
Change-Id: Iff27dc2904f4f0d7c25a684cd6ba16a597f252fd
2014-07-30 14:36:35 -07:00
Christopher Ferris
7dc7f3221f
Add dumping of tombstones to dumpstate.
...
Dump only those tombstones modified within the last half an hour.
Change-Id: I8ce836b2e19eba7a9c0c31a4f312f9a382526da7
2014-07-23 19:18:07 -07:00
Christopher Ferris
1fe6107b66
Add dumping of tombstones to dumpstate.
...
Dump only those tombstones modified within the last half an hour.
Change-Id: I8ce836b2e19eba7a9c0c31a4f312f9a382526da7
2014-07-23 16:33:01 -07:00
Elliott Hughes
d2a049220a
Always #include <sys/...>, not <linux/...>.
...
(cherry picked from commit 1e4ee9afd2
)
Change-Id: Ie005774484f98bb33c8f867cddb778ac04a1d4ea
2014-07-18 18:19:54 -07:00
Elliott Hughes
119b765a05
Fix implicit declaration of function 'prctl' in installd.
...
(cherry picked from commit ec535c5ba5
)
Change-Id: I3da977d85ce544b23ff00934fdbd201d683e9210
2014-07-18 17:30:32 -07:00
Elliott Hughes
1e4ee9afd2
Always #include <sys/...>, not <linux/...>.
...
Change-Id: I9a3f574e0dd1d3ba39312254513b8b193b610c09
2014-07-18 17:54:09 -07:00
Elliott Hughes
ec535c5ba5
Fix implicit declaration of function 'prctl' in installd.
...
Change-Id: I469ee15a0a8a79d005b15aad5097b6c13c20ab7e
2014-07-18 17:29:15 -07:00
Colin Cross
0d6180f122
dumpstate: fix dumping traces for vm processes on 64-bit
...
dumpstate was not dumping any stack traces for vm processes because
it was failing the string compare for /system/bin/app_process.
64-bit devices use app_process32 and app_process64 instead of
app_process, and zygote64 alongside zygote. Change the string
matching to be prefix matching.
(cherry picked from commit 8eb25d552b
)
Change-Id: I6b1568161fae278f0e6107990e5b750cf0ca902b
2014-07-17 12:42:14 -07:00
Colin Cross
8eb25d552b
dumpstate: fix dumping traces for vm processes on 64-bit
...
dumpstate was not dumping any stack traces for vm processes because
it was failing the string compare for /system/bin/app_process.
64-bit devices use app_process32 and app_process64 instead of
app_process, and zygote64 alongside zygote. Change the string
matching to be prefix matching.
Change-Id: I6970e1b1fedfcd601f8db6af62852422fcb71d59
2014-07-16 19:03:49 -07:00
Jeff Sharkey
c796b681e5
Offer to delete code cache directories.
...
Bug: 16187224
Change-Id: Ia860b051a34ffdfb4f6e0ea19f90cb73509c4eee
2014-07-15 21:49:51 -07:00
Riley Spahn
2a0e40945b
Add MAC for remaining service_manager functionality.
...
Add SELinux MAC for the list and find functionality
to service_manager. By default the list action uses
the service_manager_type attribute as its target
object.
(cherry picked from commit c67e6307ca
)
Change-Id: Iaf14b21346822a6b544091a0f4a9949117934b9a
2014-07-15 10:11:33 -07:00
Matthew Xie
f3381cf1a6
dump bluedroid kernel status do not merge
...
Change-Id: I4617f770088f86ceda2caf58bd1fdae81b3e31df
(cherry picked from commit ed3b9a0977
)
2014-07-14 20:53:32 +00:00
Nick Kralevich
652c485467
service_manager: check binder passed lengths
...
1) Pass length through to str8 function.
2) Fix implicit function definition warning.
3) Check for NULL from bio_get_string16 functions.
Bug: 15886919
Bug: 15888753
(cherry picked from commit 7d42a3c31b
)
Change-Id: I1f826b88826561ea126d811c087ba30623141511
2014-07-14 10:19:55 -07:00
Riley Spahn
c67e6307ca
Add MAC for remaining service_manager functionality.
...
Add SELinux MAC for the list and find functionality
to service_manager. By default the list action uses
the service_manager_type attribute as its target
object.
Change-Id: I7630f21a9f3232ae3d6d8b9a1119230b40899aef
2014-07-14 12:35:23 -07:00
Nick Kralevich
7d42a3c31b
service_manager: check binder passed lengths
...
1) Pass length through to str8 function.
2) Fix implicit function definition warning.
3) Check for NULL from bio_get_string16 functions.
Bug: 15886919
Bug: 15888753
Change-Id: I78a401d55b84f382ab83911be32b8d501998aa82
2014-07-12 16:34:01 -07:00
Robin Lee
16cec83a66
am 8098af6e
: am 7c5be65f
: Merge "Rename \'mkuser\' command to \'mkuserconfig\'"
...
* commit '8098af6ea29e9d28a6314d12963cef3107de9c18':
Rename 'mkuser' command to 'mkuserconfig'
2014-07-09 17:36:12 +00:00
Robin Lee
8098af6ea2
am 7c5be65f
: Merge "Rename \'mkuser\' command to \'mkuserconfig\'"
...
* commit '7c5be65f2819bf0328715bc405483788dd7a81f2':
Rename 'mkuser' command to 'mkuserconfig'
2014-07-09 17:31:58 +00:00
Brian Carlstrom
fe91d89b4f
am d441dbc6
: am cbb9d0d7
: Merge "Make dex2oat heap size product configurable [frameworks/native]"
...
* commit 'd441dbc6436dbf8cb13f0b784c7d16f022b7586e':
Make dex2oat heap size product configurable [frameworks/native]
2014-07-09 15:07:38 +00:00
Sreeram Ramachandran
c88da7cc21
resolved conflicts for merge of 928e05b1
to master
...
Change-Id: I1d1e623a1f95baa4375a87242ce71ea789884649
2014-07-09 08:05:04 -07:00
Brian Carlstrom
d441dbc643
am cbb9d0d7
: Merge "Make dex2oat heap size product configurable [frameworks/native]"
...
* commit 'cbb9d0d74008e460963a3c3094f654c50a04a295':
Make dex2oat heap size product configurable [frameworks/native]
2014-07-09 12:36:58 +00:00
Sreeram Ramachandran
928e05b12b
am 0d2bee0c
: Merge "Dump all the correct routing tables."
...
* commit '0d2bee0c0baec56ec98867d7e044602097525248':
Dump all the correct routing tables.
2014-07-09 00:13:15 +00:00
Nick Kralevich
1aa9565ce1
am f9cfae24
: Merge "Remove inline access control in service_manager."
...
* commit 'f9cfae24123bae199a07bee2dd1c307906c6e6d0':
Remove inline access control in service_manager.
2014-07-07 23:09:27 +00:00
Brian Carlstrom
cbb9d0d740
Merge "Make dex2oat heap size product configurable [frameworks/native]"
2014-07-07 17:50:18 +00:00
Brian Carlstrom
e46a75a0f6
Make dex2oat heap size product configurable [frameworks/native]
...
Bug: 15919420
Change-Id: I0e629ff4f7541f0dde7380e0dbc8dab1c13df7bd
2014-07-08 15:12:07 -07:00
Sreeram Ramachandran
2b3bba34ae
Dump all the correct routing tables.
...
The list of tables is maintained in /data/misc/net/rt_tables by netd.
Change-Id: I55475c08c5e43bcf61af916210e680c47480ac32
2014-07-08 16:29:45 -07:00
Robin Lee
7c5be65f28
Merge "Rename 'mkuser' command to 'mkuserconfig'"
2014-07-04 08:02:36 +00:00
Nick Kralevich
f9cfae2412
Merge "Remove inline access control in service_manager."
2014-07-02 20:49:53 +00:00
Nick Kralevich
0830ce19ae
resolved conflicts for merge of 1aa9565c
to master
...
Change-Id: I30582926ab2d2e2b97cb95aaedcd54ba51832aba
2014-07-07 16:27:42 -07:00
Brian Carlstrom
1da16cebe6
am a5726eb9
: Merge "Use current max product dalvik.vm.heapsize as default dex2oat heap size"
...
* commit 'a5726eb954588bd27ffa55a5193e7c0f8bd9eac3':
Use current max product dalvik.vm.heapsize as default dex2oat heap size
2014-06-27 23:02:11 +00:00
Brian Carlstrom
3aa138617b
Use current max product dalvik.vm.heapsize as default dex2oat heap size
...
Bug: 15919420
Change-Id: I7ea3bbfe787026f272e50690ab3b84f894600191
2014-06-27 14:15:19 -07:00
Riley Spahn
1244edcb85
Remove inline access control in service_manager.
...
Remove the hardcoded tuples of UIDs and the services that
each is allowed to register. We will rely only on permissions
from SELinux.
Change-Id: I1c44555a6e274814282398865b30ee938f40dabb
2014-06-26 15:48:21 -07:00
Brian Carlstrom
53e0776d96
Use current max product dalvik.vm.heapsize as default dex2oat heap size
...
Bug: 15919420
(cherry picked from commit 3aa138617b
)
Change-Id: I569ba111c6163e94dd1b09b21ef374f05d263e72
2014-06-27 14:19:36 -07:00
Dan Stoza
e49ba8e2ed
GLConsumer: Stop using default constructor params
...
Removes the dependency on default constructor parameters for
GLConsumer so that a different constructor prototype can safely be
added.
Change-Id: I0da924bbd4c141edbf305598c1be8bc575654680
2014-06-24 13:09:19 -07:00
Narayan Kamath
b410863d6a
am 9bc8c62e
: am 357df19b
: Merge "Exclude subdirectories when pruning the dex cache."
...
* commit '9bc8c62ea4d86d948af7a2aade8b0b5502a84b6a':
Exclude subdirectories when pruning the dex cache.
2014-06-24 12:32:45 +00:00
Narayan Kamath
9bc8c62ea4
am 357df19b
: Merge "Exclude subdirectories when pruning the dex cache."
...
* commit '357df19b14b8387a480ed68dd6ea92eeb1aa4edc':
Exclude subdirectories when pruning the dex cache.
2014-06-24 12:13:30 +00:00
Narayan Kamath
357df19b14
Merge "Exclude subdirectories when pruning the dex cache."
2014-06-24 06:22:45 +00:00
Narayan Kamath
1e57e4af8a
Exclude subdirectories when pruning the dex cache.
...
This requires a companion package manager change to prune
each instruction specific dex cache individually.
bug: 15677279
Change-Id: I5891981512bde20e49bff65b1842c28886f2b177
2014-06-20 17:46:58 +01:00
Brian Carlstrom
314f2f7751
am 724473b3
: am 71f9956a
: Merge "Fix obsolete argument name"
...
* commit '724473b359d63bf707bd1fe04abdc82edc5fd22d':
Fix obsolete argument name
2014-06-17 20:05:05 +00:00
Brian Carlstrom
724473b359
am 71f9956a
: Merge "Fix obsolete argument name"
...
* commit '71f9956a23885e64626828a1afa8c512e29be8cc':
Fix obsolete argument name
2014-06-17 20:00:17 +00:00
Brian Carlstrom
71f9956a23
Merge "Fix obsolete argument name"
2014-06-17 05:00:50 +00:00
Brian Carlstrom
7195fcc218
Fix obsolete argument name
...
Change-Id: I8030f055ee49dc86d4592f36791edddfc0d60a31
2014-06-16 13:28:03 -07:00
Narayan Kamath
24730ee621
am 395a6a64
: am 8c9bcff8
: Merge "Add an installd command to prune dex files."
...
* commit '395a6a642dc3f7c2fe99080bbfcb31a20cb2fba9':
Add an installd command to prune dex files.
2014-06-16 13:31:37 +00:00
Narayan Kamath
395a6a642d
am 8c9bcff8
: Merge "Add an installd command to prune dex files."
...
* commit '8c9bcff892ae30897a971c3b97305e70db5b5bd3':
Add an installd command to prune dex files.
2014-06-16 13:28:01 +00:00
Nick Kralevich
f40c1fe5ae
am 3dd3de03
: Merge "installd: change profile files to 0660"
...
* commit '3dd3de03de17546d785ed2a741fc645c1a0fcad5':
installd: change profile files to 0660
2014-06-12 23:12:43 +00:00
Wink Saville
e9ecca2758
Merge "Merge kwd to master"
2014-06-12 21:07:47 +00:00
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
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
Wink Saville
653e1cf46a
Merge kwd to master
...
Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
2014-06-11 15:24:52 -07:00
Calin Juravle
14be6fa62e
am 17e1d2ca
: am 7281ca65
: Merge "Pass --top-k-profile-threshold to dex2oat if available."
...
* commit '17e1d2ca97a711ab539044912bb985a10ccbc9fd':
Pass --top-k-profile-threshold to dex2oat if available.
2014-06-11 21:37:57 +00: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
Nick Kralevich
0db0f97d87
installd: change profile files to 0660
...
Profiling information leaks data about how people interact
with apps, so we don't want the data to be available
to other apps. Only the app and system_server need access.
Don't create the /data/dalvik-cache/profiles directory. init.rc
does it for us now.
Change-Id: Ic1b44009faa30d704855e97631006c4b990a4ad3
2014-06-12 14:54:43 -07:00
Narayan Kamath
8c9bcff892
Merge "Add an installd command to prune dex files."
2014-06-10 21:26:11 +00:00
Calin Juravle
7281ca65d0
Merge "Pass --top-k-profile-threshold to dex2oat if available."
2014-06-10 21:26:11 +00:00
Nick Kralevich
a3db3622c5
am f40c1fe5
: am 3dd3de03
: Merge "installd: change profile files to 0660"
...
* commit 'f40c1fe5ae6afb9ce1fb179c3b0686d22ca98469':
installd: change profile files to 0660
2014-06-12 23:17:36 +00:00
Nick Kralevich
f15b30a47c
am 9f12f80d
: am 18c9394c
: Merge "Add SELinux checks when adding a service."
...
* commit '9f12f80d4af350789a64f5c30531ce790d9b6ea3':
Add SELinux checks when adding a service.
2014-06-12 21:09:29 +00:00
Robin Lee
7c8bec0179
Rename 'mkuser' command to 'mkuserconfig'
...
Brings the name more in line with what it actually does.
Change-Id: I0adb14deb1a035abdbe51714356bd0c94ccf04c5
2014-06-10 18:59:55 +01:00
Narayan Kamath
3aee2c5c74
Add an installd command to prune dex files.
...
This is a straightforward port of logic from
PackageManagerService#pruneDexFiles.
bug: 14407732
Change-Id: I892cff027ddcbb1a4fb37a7af5ecf1697049a188
2014-06-10 15:21:18 +01: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
Robin Lee
8400b2c6dd
am 04eb4227
: am c4193f1f
: Merge "Migrate keychain directories to /data/misc/user/0"
...
* commit '04eb4227b0ee880141d6ffbf170e79b78affea15':
Migrate keychain directories to /data/misc/user/0
2014-06-09 14:46:58 +00: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
95081df451
am fb617aa8
: am 06642342
: Merge "Don\'t always add profile-file option to dex2oat"
...
* commit 'fb617aa82ad2b6671aa1bc37afa115418cd9091c':
Don't always add profile-file option to dex2oat
2014-06-09 10:05:06 +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
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
wsmlby
80b3d8fce2
Merge "Add dual mode to flatland"
2014-06-05 21:16:47 +00:00
wsmlby
57c9a00616
Add dual mode to flatland
...
Change-Id: I3544e12c9c911cfdd73fa20d038068c9eccb4161
2014-06-05 14:12:41 -07:00
Robin Lee
958ad9181a
am 53b49268
: am 8adb5a82
: Merge "Add installd command to create /data/misc user dir"
...
* commit '53b4926828fae0e78b467d49a6084b324bcbdcb7':
Add installd command to create /data/misc user dir
2014-06-05 17:56:59 +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
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
Eric Laurent
9882be8960
add sound trigger native service
...
Change-Id: I5d6fe1ecacca3a941317f841009322bafdf6adcd
2014-06-03 08:20:07 -07:00
Elliott Hughes
3e54077d42
am e77cb931
: am 259c2508
: am 03e2f8fa
: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
...
* commit 'e77cb9317de54ea0041eeef7966b818257158f64':
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
2014-05-29 01:08:06 +00:00
Elliott Hughes
e77cb9317d
am 259c2508
: am 03e2f8fa
: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
...
* commit '259c25080d8b7f3b66e27e4d8ac3a268738ebe3f':
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
2014-05-29 01:04:28 +00:00
Elliott Hughes
259c25080d
am 03e2f8fa
: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
...
* commit '03e2f8fa13a791d744758ec9ffe27f52cab730d0':
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
2014-05-29 01:02:16 +00:00
Elliott Hughes
03e2f8fa13
Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
2014-05-29 00:59:01 +00:00
Brian Carlstrom
28ec03035d
am e67810fd
: am 97a51ad4
: Merge "Move to dalvik.vm.lib.2 to force default to libart"
...
* commit 'e67810fd7a00ffa92337c6f3aa6114136ce12613':
Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 23:13:27 +00:00
Brian Carlstrom
e67810fd7a
am 97a51ad4
: Merge "Move to dalvik.vm.lib.2 to force default to libart"
...
* commit '97a51ad44ae3dcf4976076382923ddcae16233ee':
Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 22:31:43 +00:00
Brian Carlstrom
856bc78efc
Move to dalvik.vm.lib.2 to force default to libart
...
Bug: 14298175
(cherry picked from commit c4ac3124ff
)
Change-Id: I97cc3ff7a269e671b315afa8673dae43d1f86bf1
2014-05-28 14:48:36 -07:00
Brigid Smith
750aa9743c
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
...
Bug: 15116468
Change-Id: I621532fb53b8317f5a513edfbeb0c50c265342fc
2014-05-28 14:42:09 -07:00
Brian Carlstrom
c4ac3124ff
Move to dalvik.vm.lib.2 to force default to libart
...
Bug: 14298175
Change-Id: Id3892a32848fb22fbf4c2861218b51f68e830b34
2014-05-28 14:31:47 -07:00
Santos Cordon
203fe88ed8
DO NOT MERGE Allow "telecomm" service to be registered with the phone UID.
...
Change-Id: I9180797451dcb2e9029b20bed47f5d5cb8cddb9f
(cherry picked from commit 3fb4de7193
)
2014-05-28 04:50:04 +00:00
Nick Kralevich
2f9a3e73bf
am 449e0dbe
: am fc1b9fa3
: am b66ee6c3
: Merge "Ensure that app lib symlinks are correctly labeled when created."
...
* commit '449e0dbe94126553c96cece21da54b40a6880f11':
Ensure that app lib symlinks are correctly labeled when created.
2014-05-13 20:41:41 +00:00
Nick Kralevich
449e0dbe94
am fc1b9fa3
: am b66ee6c3
: Merge "Ensure that app lib symlinks are correctly labeled when created."
...
* commit 'fc1b9fa3178d1452629d75e2afa1a9d72f03fc1c':
Ensure that app lib symlinks are correctly labeled when created.
2014-05-13 20:38:20 +00:00
Nick Kralevich
fc1b9fa317
am b66ee6c3
: Merge "Ensure that app lib symlinks are correctly labeled when created."
...
* commit 'b66ee6c32d87961d5b9f0be97b5fdccb928fd453':
Ensure that app lib symlinks are correctly labeled when created.
2014-05-13 20:35:38 +00:00
Stephen Smalley
3a98389263
Ensure that app lib symlinks are correctly labeled when created.
...
At present, the app lib symlinks are created before setting
the package directory security context, and therefore default
to system_data_file. Upon a later restorecon_recursive,
they are relabeled to the same type as the package directory,
e.g. app_data_file. Avoid this inconsistency by setting the
package directory security context before creating the symlink
so that it inherits the same security context.
Change-Id: I1ee6ccd8a2aa63a4d2efda67f313c97932235911
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-05-13 12:59:40 -04:00
Narayan Kamath
fc4e378877
am 44df726a
: am cb079c89
: Merge "Add instruction-set arguments to installd commands."
...
* commit '44df726a6cf4fe1119e146c9a18c78966a6305d3':
Add instruction-set arguments to installd commands.
2014-05-01 14:05:10 +00:00
Narayan Kamath
44df726a6c
am cb079c89
: Merge "Add instruction-set arguments to installd commands."
...
* commit 'cb079c899ac9d9c5ec90840249821f58c817406c':
Add instruction-set arguments to installd commands.
2014-05-01 14:00:54 +00:00
Narayan Kamath
1b40032077
Add instruction-set arguments to installd commands.
...
The instruction-set is used to construct the dalvik cache
path and is also passed down to dex2oat.
(cherry picked from commit 791781bfb8
)
Change-Id: I43396b16f6eaecacf0fb7d052526fc5a239167ac
2014-05-01 11:38:02 +01:00
Nick Vaccaro
bd81c258c2
am 45fcfb48
: am 85453ecc
: dumpstate: increase poll timeout waiting for SIGQUIT logging
...
* commit '45fcfb48ef9e65747e7a3f35e1a4da232f6e161a':
dumpstate: increase poll timeout waiting for SIGQUIT logging
2014-04-30 23:35:03 +00:00
Nick Vaccaro
45fcfb48ef
am 85453ecc
: dumpstate: increase poll timeout waiting for SIGQUIT logging
...
* commit '85453ecc90a94564e586f0f97c9ec2c0cf831501':
dumpstate: increase poll timeout waiting for SIGQUIT logging
2014-04-30 20:35:15 +00:00
Nick Vaccaro
85453ecc90
dumpstate: increase poll timeout waiting for SIGQUIT logging
...
Increased the maximum time dumpstate will wait for SIGQUIT process
to finish dumping its thread stacks to the logfile to 5 seconds.
Bug: 14057177
Change-Id: I0b43004512855d202f2fe0ea7b0e934e77a3a070
2014-04-30 11:28:31 -07:00
Narayan Kamath
791781bfb8
Add instruction-set arguments to installd commands.
...
The instruction-set is used to construct the dalvik cache
path and is also passed down to dex2oat.
Change-Id: Ie480841b3e917dabe23ad4d5f4a0b08990500a51
2014-04-30 09:39:37 +01:00
Bill Yi
e4f00b2aae
Merge commit '6d05ef2310bdc84811d5b0385b009ad11447a749' into HEAD
2014-04-29 11:34:19 -07:00
Brian Carlstrom
aaa22fd38c
am 58ea37fe
: am 108ed9fa
: Merge "Fix incorrect odex path handling"
...
* commit '58ea37fe26fc733db478e606374f08d8a9d070cc':
Fix incorrect odex path handling
2014-04-28 22:10:01 +00:00
Brian Carlstrom
58ea37fe26
am 108ed9fa
: Merge "Fix incorrect odex path handling"
...
* commit '108ed9fa946ec516c0d853927c76ebbfca1dcb23':
Fix incorrect odex path handling
2014-04-28 22:06:09 +00:00
Chih-Wei Huang
0e8ae16f08
Fix incorrect odex path handling
...
It's wrong to just concatenate the apk_path and .odex.
The bug prevents the prebuilt odex being used since Kitkat.
The patch is copied from the code of JellyBean.
Change-Id: I0ce8a877e3df8ae1ab9a0e3aeeef2d5253efc223
2014-04-28 14:08:16 -07:00
Mohamad Ayyash
dd306d43ed
Merge "atrace: Add f2fs sync and ext4 write tracepoints."
2014-04-15 22:10:10 +00:00
Mohamad Ayyash
26dbcbe013
atrace: Add f2fs sync and ext4 write tracepoints.
...
Change-Id: I76fa32f7d80aaeafc26494d9018b7a004e7dc3d2
2014-04-11 17:31:31 -07:00
Nick Kralevich
db1d823b4c
am 236ed6d3
: am 82fb5809
: Merge "restorecon the profile directory."
...
* commit '236ed6d3d376b12573cca6878d3b5013371f5bc8':
restorecon the profile directory.
2014-04-09 19:49:43 +00:00
Nick Kralevich
236ed6d3d3
am 82fb5809
: Merge "restorecon the profile directory."
...
* commit '82fb58095524c833b0470c4b236aa8a70acf2a0f':
restorecon the profile directory.
2014-04-09 19:46:14 +00:00
Stephen Smalley
a240733137
restorecon the profile directory.
...
This is required so that it will be assigned the correct SELinux
security context on first creation by installd.
Bug: 13927667
Change-Id: I4857d031f9e7e60d48b8c72fcb22a81b3a2ebaaa
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-04-09 19:08:20 +00:00
Nick Kralevich
96668903e4
am 4b3d6e31
: am 3ebb877e
: Merge "Modify installd\'s restorecon function."
...
* commit '4b3d6e310016140026b0b6c9dca757bf37d6d26a':
Modify installd's restorecon function.
2014-03-31 20:26:29 +00:00
Nick Kralevich
4b3d6e3100
am 3ebb877e
: Merge "Modify installd\'s restorecon function."
...
* commit '3ebb877e52a2661de56c3f44827f33824e735730':
Modify installd's restorecon function.
2014-03-31 20:20:44 +00:00
Robert Craig
da30dc7336
Modify installd's restorecon function.
...
Changes above with PMS and below with libselinux
have resulted in a few changes to the restorecon data
api. This change is needed in order to support the new
way to issue a recursive restorecon of certain
/data/data directories.
The restorecondata function has also been modified to
find all users on the device for a given package name
(argument to the function) and to issue a separate
recursive restorecon call for each.
Change-Id: Ie440cba2c96f0907458086348197e1506d31c1b6
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-03-28 14:32:07 -04:00
Nick Kralevich
9cddbd258d
am d9ee7dee
: am b1a8c016
: Merge "Send libselinux logging to logcat."
...
* commit 'd9ee7dee2cf42c0e672c7ac85c0252a22d3e5f08':
Send libselinux logging to logcat.
2014-03-26 16:36:38 +00:00
Nick Kralevich
d9ee7dee2c
am b1a8c016
: Merge "Send libselinux logging to logcat."
...
* commit 'b1a8c016371282a3cd3b113e6b2c0310372babf2':
Send libselinux logging to logcat.
2014-03-26 15:55:46 +00:00
Stephen Smalley
7abb52bcaf
Send libselinux logging to logcat.
...
Otherwise we can't readily see log messages from libselinux calls
made by installd.
Change-Id: I319b30c181470468fe19dd5fbe9251ef03f1163b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-03-26 09:31:25 -04:00
Xia Wang
d0d4366475
am a0da27d5
: am 9c7db080
: Build the benchmark test to /data/local/tmp/ for automated test
...
* commit 'a0da27d546865d075322c410121e9c3101cec449':
Build the benchmark test to /data/local/tmp/ for automated test
2014-03-25 03:53:59 +00:00
Xia Wang
a0da27d546
am 9c7db080
: Build the benchmark test to /data/local/tmp/ for automated test
...
* commit '9c7db08049e1d36c2f60dd703f27c432bc8cfbc5':
Build the benchmark test to /data/local/tmp/ for automated test
2014-03-25 03:46:32 +00:00
Xia Wang
6d05ef2310
am 9c7db080
: Build the benchmark test to /data/local/tmp/ for automated test
...
* commit '9c7db08049e1d36c2f60dd703f27c432bc8cfbc5':
Build the benchmark test to /data/local/tmp/ for automated test
2014-03-24 18:39:57 +00:00
Xia Wang
9c7db08049
Build the benchmark test to /data/local/tmp/ for automated test
...
Change-Id: I27a5ee24636ff9752a35dbab793821f6b7a79221
(cherry picked from commit b7925f1364
)
2014-03-24 18:13:19 +00:00
Nick Kralevich
bb9c93bb6e
am 5d58e309
: am 1bf30245
: Merge "Extend installd to support SELinux restorecon function."
...
* commit '5d58e3092d70231da57140a7d9d9fbb87fd4b8e6':
Extend installd to support SELinux restorecon function.
2014-03-19 20:41:51 +00:00
Nick Kralevich
5d58e3092d
am 1bf30245
: Merge "Extend installd to support SELinux restorecon function."
...
* commit '1bf30245cbb8be7279fadcf4071cecc8db91789f':
Extend installd to support SELinux restorecon function.
2014-03-19 20:29:27 +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
Dan Stoza
2c22093c1c
Merge "Remove deprecated BufferQueue constructor"
2014-03-17 18:46:14 +00:00
Mark Salyzyn
993146092f
am d4dabf87
: am cdbf28b3
: Merge "native frameworks: 64-bit compile issues"
...
* commit 'd4dabf872ac0a12e12aebae9032f7d62762c2aeb':
native frameworks: 64-bit compile issues
2014-03-13 23:12:09 +00:00
Dan Stoza
6780a2d6a5
Remove deprecated BufferQueue constructor
...
Bug: 13415624
Change-Id: I1c17833511b5961af5a9bbb9cc3d627ce558d424
2014-03-13 11:31:43 -07:00
Mark Salyzyn
d4dabf872a
am cdbf28b3
: Merge "native frameworks: 64-bit compile issues"
...
* commit 'cdbf28b3f7f5327f4cb0eb95b8326bf4c24c87ba':
native frameworks: 64-bit compile issues
2014-03-13 15:26: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
d105876a6c
am 85864b87
: am 06ed9491
: Merge "Fix parameter ordering for installd\'s dex2oat execl."
...
* commit '85864b8724b3908d2f5aa861276ce5e80d7f820e':
Fix parameter ordering for installd's dex2oat execl.
2014-03-12 19:57:05 +00:00
Anwar Ghuloum
85864b8724
am 06ed9491
: Merge "Fix parameter ordering for installd\'s dex2oat execl."
...
* commit '06ed9491418ce84e4272bf4201545fa6cfe3932e':
Fix parameter ordering for installd's dex2oat execl.
2014-03-11 23:43:19 +00:00
Anwar Ghuloum
4bc054019d
Fix parameter ordering for installd's dex2oat execl.
...
Change-Id: Ibd6fd46c6ec3137874f9a3d5eea134bc804e039a
2014-03-11 15:42:58 -07:00
Andy McFadden
e98151e004
Remove "screenshot"
...
This is the old screenshot utility, which relies on direct access
to the framebuffer device. It was replaced a long time ago by
"screencap", which talks to SurfaceFlinger (and includes a fallback
that tries to use the FB dev).
Change-Id: Id75a574bc78033761070b64d528fed06e23a0189
2014-03-11 11:21:21 -07:00
Dave Allison
544b09523b
am 13c6fb10
: am 1649c77e
: Merge "ART profiler"
...
* commit '13c6fb1026531635f409f111d78d561592d2ede9':
ART profiler
2014-03-08 07:28:20 +00:00
Dave Allison
13c6fb1026
am 1649c77e
: Merge "ART profiler"
...
* commit '1649c77ed29eada5de32ace97033b9d898e9a6eb':
ART profiler
2014-03-08 01:56:32 +00: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
Mathieu Chartier
62d0f901fd
Don't pass in empty arg to dex2oat.
...
We would occassionally pass in an empty arg "" instead of a NULL.
This caused problems since dex2oat isn't made to handle empty args.
(cherry picked from commit f53dbfeda3
)
Change-Id: Ia2d60b895391bf83b5d250c20ddb8a4917d347a6
2014-03-05 17:56:31 -08:00
Mathieu Chartier
1d84e25648
am 3c39e03c
: Merge "Don\'t pass in empty arg to dex2oat."
...
* commit '3c39e03c08094ce65608cae8a45dd726cf10b5c3':
Don't pass in empty arg to dex2oat.
2014-03-06 01:05:22 +00:00
Mathieu Chartier
f53dbfeda3
Don't pass in empty arg to dex2oat.
...
We would occassionally pass in an empty arg "" instead of a NULL.
This caused problems since dex2oat isn't made to handle empty args.
Change-Id: Ibb1aed64a4aa17459b2a75a5a2abcf13c7fa8ac7
2014-03-05 16:58:48 -08:00
Brian Carlstrom
cd44310a13
am c9e60374
: am e19c99aa
: Merge "Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags"
...
* commit 'c9e60374f5144e94103e5b866570be114aa165c8':
Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags
2014-03-05 22:33:26 +00:00
Brian Carlstrom
c9e60374f5
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-05 20:09:46 +00:00
Brian Carlstrom
0ae8e39ebc
Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags
...
Change-Id: Ic048ed654ea0ae38c9684e5fa5b14742b6b83305
2014-03-04 14:11:55 -08:00
Narayan Kamath
87eb08dc07
am ad0f05be
: am b98c4761
: Merge "Correcting include path in installd test project\'s Android.mk"
...
* commit 'ad0f05bed95dc816a5b1e4bea23b0736458c1857':
Correcting include path in installd test project's Android.mk
2014-02-28 16:23:59 +00:00
Narayan Kamath
ad0f05bed9
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-02-28 16:19:30 +00:00
Ramin Zaghi
7400742285
Correcting include path in installd test project's Android.mk
...
installd project has moved from frameworks/base to frameworks/native
and so its test project's c_include path defined in Android.mk
has to match the change.
Change-Id: I597125ff659f51edbd9fc95371790e2d567c78be
2014-02-28 15:41:57 +00:00
Xia Wang
b7925f1364
Build the benchmark test to /data/local/tmp/ for automated test
...
Change-Id: I27a5ee24636ff9752a35dbab793821f6b7a79221
2014-02-26 18:04:50 -08:00
Dianne Hackborn
20c7adbfaa
am b37b312b
: am 7d86b454
: Merge "frameworks/native: move idmap to frameworks/base"
...
* commit 'b37b312b829c7ab5107c2f96d0a95a557f67a831':
frameworks/native: move idmap to frameworks/base
2014-02-14 02:00:17 +00:00
Dianne Hackborn
b37b312b82
am 7d86b454
: Merge "frameworks/native: move idmap to frameworks/base"
...
* commit '7d86b45472898373bbe3ef03286b66d71ea82b79':
frameworks/native: move idmap to frameworks/base
2014-02-14 01:54:37 +00:00
Dianne Hackborn
7d86b45472
Merge "frameworks/native: move idmap to frameworks/base"
2014-02-14 01:45:28 +00:00
Nick Kralevich
165c8bdfb5
am 0e4d2885
: am 2044ac43
: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
...
* commit '0e4d2885a34d31f5dbe5a08bdb654953abaf82a2':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-13 00:16:04 +00:00
Nick Kralevich
0e4d2885a3
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-02-12 23:15:07 +00:00
Nick Kralevich
2044ac43e5
Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
2014-02-12 23:09:45 +00:00
Colin Cross
07a4728150
frameworks/native: move idmap to frameworks/base
...
idmap depends on libandroidfw, so it should go in frameworks/base.
Change-Id: Ieee30ba9d8170d3118acc89f0617981228a6974b
2014-02-11 18:04:03 -08:00
Dianne Hackborn
297097957f
am 6e5fdb15
: am 6c14f0ad
: Merge "Runtime resource overlay, iteration 2"
...
* commit '6e5fdb1551ca7d117bf7e1acca133a077a8701f0':
Runtime resource overlay, iteration 2
2014-02-11 21:49:02 +00:00
Dianne Hackborn
6e5fdb1551
am 6c14f0ad
: Merge "Runtime resource overlay, iteration 2"
...
* commit '6c14f0ad82be418c742e56fe586657ea0f394b05':
Runtime resource overlay, iteration 2
2014-02-11 21:41:23 +00:00
Dianne Hackborn
6c14f0ad82
Merge "Runtime resource overlay, iteration 2"
2014-02-11 21:27:36 +00:00