Sreeram Ramachandran
b5e85e1dc1
am 224bcea7
: Remove unnecessary code and APIs.
...
* commit '224bcea7b4f8bc0f1edb0c3303d30fedfcabe0f4':
Remove unnecessary code and APIs.
2014-07-14 19:10:45 +00:00
Robin Lee
71fdeb3fa2
am 16cec83a
: am 8098af6e
: am 7c5be65f
: Merge "Rename \'mkuser\' command to \'mkuserconfig\'"
...
* commit '16cec83a6604777ffdf89b72d9fc474f0c0b73b5':
2014-07-14 19:10:44 +00:00
Brian Carlstrom
de528b291b
am fe91d89b
: am d441dbc6
: am cbb9d0d7
: Merge "Make dex2oat heap size product configurable [frameworks/native]"
...
* commit 'fe91d89b4f33f753b8b20049221609af7b552b9d':
2014-07-14 19:10:44 +00:00
Sreeram Ramachandran
5b717fc3ef
am c88da7cc
: resolved conflicts for merge of 928e05b1
to master
...
* commit 'c88da7cc21c61b9ac8fcac11aa812f647ffb181c':
2014-07-14 19:10:43 +00:00
Joe LaPenna
aa862d0643
am 46a86a9b
: Add ethernet feature xml.
...
* commit '46a86a9bbf31fafc7ab635b9503c77f329a2f445':
Add ethernet feature xml.
2014-07-14 19:10:43 +00:00
Ben Clayton
352eb9b3d0
am 6d96ab19
: Merge "Add data capturing of glCompressedTexImage2D and glCompressedTexSubImage2D calls."
...
* commit '6d96ab194a278d4e06ce3e9a26a5658f3992e91c':
Add data capturing of glCompressedTexImage2D and glCompressedTexSubImage2D calls.
2014-07-14 19:10:42 +00:00
Nick Kralevich
c5496b6c1f
am 71139783
: Merge "service_manager: check binder passed lengths"
...
* commit '7113978314a217f1fd2c1dd3d9bc25f516fb71a8':
service_manager: check binder passed lengths
2014-07-14 18:18:04 +00:00
Robin Lee
6729f6a76e
am 7c5be65f
: Merge "Rename \'mkuser\' command to \'mkuserconfig\'"
...
* commit '7c5be65f2819bf0328715bc405483788dd7a81f2':
Rename 'mkuser' command to 'mkuserconfig'
2014-07-14 17:48:25 +00:00
Brian Carlstrom
bd7db85c26
am cbb9d0d7
: Merge "Make dex2oat heap size product configurable [frameworks/native]"
...
* commit 'cbb9d0d74008e460963a3c3094f654c50a04a295':
Make dex2oat heap size product configurable [frameworks/native]
2014-07-14 17:48:23 +00:00
Sreeram Ramachandran
a055fd358b
resolved conflicts for merge of 0d2bee0c
to lmp-dev-plus-aosp
...
Change-Id: If782ce04be50e2154cec232c9e9d60fe38f41831
2014-07-14 10:45:26 -07:00
Nick Kralevich
7113978314
Merge "service_manager: check binder passed lengths"
2014-07-14 15:58:16 +00: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
Sreeram Ramachandran
224bcea7b4
Remove unnecessary code and APIs.
...
This stuff has been replaced by setNetworkForUser() in NetdClient.
Change-Id: If525ee259b74314191d1913f7c2a3e828e05c38f
2014-07-11 17:43:51 -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
Joe LaPenna
46a86a9bbf
Add ethernet feature xml.
...
BUG: 15143878
Change-Id: I15dbac6a7e73a94960e76669120792724fbd8acb
2014-07-08 11:38:14 -07:00
Nick Kralevich
0830ce19ae
resolved conflicts for merge of 1aa9565c
to master
...
Change-Id: I30582926ab2d2e2b97cb95aaedcd54ba51832aba
2014-07-07 16:27:42 -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
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
Ben Clayton
6d96ab194a
Merge "Add data capturing of glCompressedTexImage2D and glCompressedTexSubImage2D calls."
2014-07-02 19:53:18 +00: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