ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
51,064 Commits 2 Branches 0 Tags 54 MiB
0adea3b792
Commit Graph

469 Commits

Author SHA1 Message Date
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