Sreeram Ramachandran
c88da7cc21
resolved conflicts for merge of 928e05b1
to master
...
Change-Id: I1d1e623a1f95baa4375a87242ce71ea789884649
2014-07-09 08:05:04 -07: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
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
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
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