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
Joe LaPenna
46a86a9bbf
Add ethernet feature xml.
...
BUG: 15143878
Change-Id: I15dbac6a7e73a94960e76669120792724fbd8acb
2014-07-08 11:38:14 -07: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
0d2bee0c0b
Merge "Dump all the correct routing tables."
2014-07-05 03:01:43 +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
Ben Clayton
6d96ab194a
Merge "Add data capturing of glCompressedTexImage2D and glCompressedTexSubImage2D calls."
2014-07-02 19:53:18 +00:00
Nick Kralevich
0830ce19ae
resolved conflicts for merge of 1aa9565c
to master
...
Change-Id: I30582926ab2d2e2b97cb95aaedcd54ba51832aba
2014-07-07 16:27:42 -07:00
Ben Clayton
3d3c125423
Add data capturing of glCompressedTexImage2D and glCompressedTexSubImage2D calls.
...
Change-Id: I38643f5d279a84f1b7069801d7c106fc8f1ae394
2014-07-07 11:57:45 +01:00
Jeff Tinker
f0ca9cd773
Merge "Fix non-portable definition of CryptoPlugin::SubSample"
2014-07-01 19:25:54 +00:00
Jeff Tinker
03a0571e96
Fix non-portable definition of CryptoPlugin::SubSample
...
bug: 16016106
Change-Id: I76514b2e7a28c86a0b0b311af575ca9dfc9471a9
2014-07-01 14:54:45 -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
Dan Stoza
dc56bf721a
Merge "BufferQueue: Add allocateBuffers method"
2014-06-27 15:56:14 +00:00
Brian Carlstrom
ff0d588db5
am 1da16ceb
: am a5726eb9
: Merge "Use current max product dalvik.vm.heapsize as default dex2oat heap size"
...
* commit '1da16cebe65b859a5cbd961a0667267393cb333b':
Use current max product dalvik.vm.heapsize as default dex2oat heap size
2014-06-27 23:06:41 +00: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
a5726eb954
Merge "Use current max product dalvik.vm.heapsize as default dex2oat heap size"
2014-06-26 18:12:01 +00: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
ab57491de3
GLConsumer: Allow creation in detached mode
...
Adds a constructor that doesn't require a GLES texture name and sets
up the GLConsumer in detached mode.
Bug: 15616428
Change-Id: Idc9ea2e59baa24bbd959da9fffe0fb71c0aa9818
2014-06-25 15:00:48 -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
Dan Stoza
29a3e90879
BufferQueue: Add allocateBuffers method
...
This adds an allocateBuffers method to BufferQueue, which instructs
it to allocate up to the maximum number of buffers allowed by the
current configuration. The goal is that this method can be called
ahead of render time, which will prevent dequeueBuffers from blocking
in allocation and inducing jank.
This interface is also plumbed up to the native Surface (and, in
another change, up to the Java Surface and ThreadedRenderer).
Bug: 11792166
Change-Id: I4aa96b4351ea1c95ed5db228ca3ef98303229c74
2014-06-20 13:13:57 -07:00
Dan Albert
677d87ec50
Use openssl's SHA1 instead of bionic's.
...
Bionic is removing its SHA1.
Change-Id: I7d15986ebac9e0f0eb7ff93457780bd90a4f1d4f
2014-06-20 11:34:29 -07: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
Ruchi Kandoi
cd13f9da99
Merge "SurfaceFlinger: send VSYNC power hints to IPowerManager"
2014-06-20 02:15:46 +00:00
Ruchi Kandoi
ef472ec40a
SurfaceFlinger: send VSYNC power hints to IPowerManager
...
VSYNC power hints are now sent via binder to IPowerManager.
SurfaceFlinger no longer loads a second copy of the PowerHAL.
VSYNC power hints are sent in batches and not on per frame basis.
Change-Id: Ia5a839ab3c857cffae7089f810b4315d4ed23fcf
2014-06-18 18:51:24 -07:00
Dan Stoza
eac96b9bfd
Merge "SurfaceFlinger: Fix rect out-of-bounds checks"
2014-06-17 21:43:29 +00:00
Andy McFadden
a317f27b7b
Merge "Add two new display info fields"
2014-06-17 20:55:27 +00: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
Andy McFadden
91b2ca8562
Add two new display info fields
...
This adds SurfaceFlinger's app VSYNC offset and buffer deadline
values to DisplayInfo.
Bug 14612039
Change-Id: Ie0ab21d388fe2764f2b6f71bd1cefa33dc861a73
2014-06-17 10:41:46 -07: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
Narayan Kamath
c6decb12c1
am ece62384
: Merge "Remove Parcel::writeIntPtr."
...
* commit 'ece6238488207bd20cc4d32fda90514ebf461206':
Remove Parcel::writeIntPtr.
2014-06-13 10:22:29 +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
Narayan Kamath
4a94201c4e
am c6decb12
: am ece62384
: Merge "Remove Parcel::writeIntPtr."
...
* commit 'c6decb12c17c36fe0a3b36107f6666552fcd3631':
Remove Parcel::writeIntPtr.
2014-06-13 10:32:16 +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
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