Ben Clayton
7b3f48d2ef
Use the count parameter to store all the uniform vectors, not just the first one. DO NOT MERGE.
...
Change-Id: Ib56d859051f0b895de5c12ffa371cd4b2b65ac0b
(cherry picked from commit 31b0aec64b
)
2014-07-21 09:52:48 +00:00
Jesse Hall
c6414d13a3
Merge "Add OpenGL ES AEP feature xml." into lmp-dev
2014-07-20 04:41:30 +00: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
Jesse Hall
abc8098fcb
Add OpenGL ES AEP feature xml.
...
Bug: 15593761
Change-Id: Ia961c64c5bf33da752518921c570c7f6dafe724e
2014-07-18 14:25:39 -07:00
Jeff Brown
31d825d7ed
Add glance gesture for doze mode.
...
Change-Id: I038a706c3999200313ff5360c5ff1150ec081f08
2014-07-17 18:19:53 -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
Eino-Ville Talvala
8227caaabf
Add XML files for new camera2 hardware features
...
Bug: 15415688
Change-Id: I1ea9f65b03c4fa06a5004f9d1d485935742001c8
2014-07-16 10:19:15 -07:00
Jeff Sharkey
c796b681e5
Offer to delete code cache directories.
...
Bug: 16187224
Change-Id: Ia860b051a34ffdfb4f6e0ea19f90cb73509c4eee
2014-07-15 21:49:51 -07:00
Sean Wan
7869e224aa
CW on L: Fix a SIGSEGV crash in sensor service.
...
This is to fix b/16189080.
BUG: 16189080
Change-Id: I78d44e82f797c0808891acde609040c46745a0bb
2014-07-15 11:10:44 -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
Ruben Brunk
2ad9d8a6e7
Merge "Add sticky transform to surfaceflinger." into lmp-dev
2014-07-14 18:37:51 +00:00
Ruben Brunk
1681d95989
Add sticky transform to surfaceflinger.
...
Bug: 15116722
- Adds a sticky transform field that can be set from a
SurfaceFlinger client Surface. This transform is
added to any transform applied to the Surface.
Change-Id: Idaa4311dfd027b2d2b8ea5e2c6cba2da5779d753
2014-07-14 22:14:32 +00: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
Jesse Hall
b154c42c39
Improve memory coherence management in screenshot code [DO NOT MERGE]
...
The existing code worked in practice, but wasn't quite correct in
theory and relied on implementation details of other code. It's still
somewhat unusual and subtle, but now is correct-in-theory (I believe)
and a little better documented.
Bug: 16044767
Change-Id: I22b01d6640f0b7beca7cbfc74981795a3218b064
(cherry picked from commit c61576794e
)
2014-07-14 19:29:09 +00:00
Jesse Hall
24cd98eef8
Compile libsurfaceflinger with Clang and -std=c++11 [DO NOT MERGE]
...
This is necessary to use C11/C++11 stdlib atomics, which the next
change will do. This change also fixes a couple bits of syntax that
both GCC and Clang refuse to compile in -std=c++11 mode.
Change-Id: Ia14d9d6b537a3bb106c23e19a277e48be180754c
2014-07-14 12:18:00 -07:00
Jesse Hall
b7d559be1f
Merge "surfaceflinger: Make all sources depend on Android.mk" into lmp-dev
2014-07-14 18:38:02 +00:00
Jesse Hall
e9b23b6588
surfaceflinger: Make all sources depend on Android.mk
...
This forces all SurfaceFlinger sources to be recompiled when the
Makefile changes; that's overkill sometimes but makes sure everything
gets recompiled when compile options (or similar) changes.
Change-Id: I2b3c3090fc1c35078e13c77fbb1a78d447c39158
2014-07-14 15:32:59 -07: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
Yuncheol Heo
96a68d45f5
Merge "Add HDMI-CEC feature xml."
2014-07-10 21:52:20 +00: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
Yuncheol Heo
ab82390e1f
Add HDMI-CEC feature xml.
...
Change-Id: I51af146550cd72564e89874c867c181326d15f2c
2014-07-11 15:37:33 +09: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
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
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