Patrick Tjin
f72aa27a2a
Merge "Add uid to sensorservice's dump of active connections"
2014-02-20 20:51:13 +00:00
Arve Hjønnevåg
5febeff15f
am 9b5c3b91
: am d5a354c6
: am d06f6b00
: am 67903293
: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
...
* commit '9b5c3b9132831ba9078fc7c4001821bcfe8dd39d':
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
2014-02-20 14:59:14 +00:00
Dan Stoza
fb83d84694
Merge "Fix calls to captureScreen"
2014-02-20 02:43:37 +00:00
Dan Stoza
8d7599633f
Fix calls to captureScreen
...
Change-Id: Ic0ff47afa29f143131906082dff79d4e907b7143
2014-02-19 18:35:30 -08:00
Dan Stoza
da03fe4bfc
Merge "Allow disabling layer rotation during screenshots"
2014-02-20 00:56:34 +00:00
Arve Hjønnevåg
9b5c3b9132
am d5a354c6
: am d06f6b00
: am 67903293
: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
...
* commit 'd5a354c6b7f2ae0b93e018f3024a2fca5f6543a1':
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
2014-02-20 00:52:13 +00:00
Arve Hjønnevåg
d5a354c6b7
am d06f6b00
: am 67903293
: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
...
* commit 'd06f6b001484c28a6ede3f1ad83d23dcb9ad3ccf':
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
2014-02-20 00:04:44 +00:00
Arve Hjønnevåg
d06f6b0014
am 67903293
: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
...
* commit '6790329358d1c84af2fe9ba093bcfc1c6176e758':
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
2014-02-20 00:00:49 +00:00
Arve Hjønnevåg
6790329358
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
...
DO NOT MERGE into any branch that uses the new interface
Change-Id: Id54308a89327e69a389ac5916c052ad97f57cb28
2014-02-19 15:35:52 -08:00
Arve Hjønnevåg
79aa621330
am 7cc5b880
: am e45636a8
: am d437364e
: am f50b9eaa
: Binder: Make sure binder objects do not overlap
...
* commit '7cc5b8800c22790b0db9ea0af62fcad2cc998303':
Binder: Make sure binder objects do not overlap
2014-02-19 22:06:09 +00:00
Arve Hjønnevåg
7cc5b8800c
am e45636a8
: am d437364e
: am f50b9eaa
: Binder: Make sure binder objects do not overlap
...
* commit 'e45636a8674b9cbb9305648e21316210e1daf920':
Binder: Make sure binder objects do not overlap
2014-02-19 21:50:15 +00:00
Arve Hjønnevåg
e45636a867
am d437364e
: am f50b9eaa
: Binder: Make sure binder objects do not overlap
...
* commit 'd437364ec156e07c5fbe3fa27a7cd55e5450e9f6':
Binder: Make sure binder objects do not overlap
2014-02-19 21:47:35 +00:00
Arve Hjønnevåg
d437364ec1
am f50b9eaa
: Binder: Make sure binder objects do not overlap
...
* commit 'f50b9eaaeeaeae16981f11b05d3f3a6fb0dea30d':
Binder: Make sure binder objects do not overlap
2014-02-19 21:45:25 +00:00
Andy McFadden
382f1cc1f1
Merge "Hide three malformed GL bindings"
2014-02-19 19:15:20 +00:00
Andy McFadden
50166d1173
Hide three malformed GL bindings
...
They were replaced with correct bindings a while back, but the
broken methods weren't hidden.
Also, pick up two changes that were made to the generated code
rather than the source.
Bug 6006380
Change-Id: Ibfe9a5f2e13e745f8d82116d1b4d8c2d025ac830
2014-02-19 10:27:24 -08:00
Andy McFadden
35571a41b3
am 22a5c8b2
: (-s ours) am 44c35ec4
: Allow "opaque" flag to be updated. DO NOT MERGE
...
* commit '22a5c8b2e3c232a7cbe452759f20fc3c8382add7':
Allow "opaque" flag to be updated. DO NOT MERGE
2014-02-19 00:05:51 +00:00
Andy McFadden
22a5c8b2e3
am 44c35ec4
: Allow "opaque" flag to be updated. DO NOT MERGE
...
* commit '44c35ec4a94eb33f7ee0df085c5d2d56d99962cf':
Allow "opaque" flag to be updated. DO NOT MERGE
2014-02-18 23:59:43 +00:00
Andy McFadden
44c35ec4a9
Allow "opaque" flag to be updated. DO NOT MERGE
...
Moves the "opaque layer" from Layer to Layer::State. This allows
it to be updated as part of a transaction.
Bug 12387406
Change-Id: I0a114ce6adf77cd12fb08f96e0691b76c475768d
2014-02-18 15:55:42 -08:00
Colin Cross
0380d5279b
am 7a66f7af
: am 913a17fd
: Merge "libagl: support multilib build"
...
* commit '7a66f7afd1b6a975ab3b99b4765781a0d66958c8':
libagl: support multilib build
2014-02-18 21:39:56 +00:00
Colin Cross
7a66f7afd1
am 913a17fd
: Merge "libagl: support multilib build"
...
* commit '913a17fd5f8cabbc73ff46db15b4b53b9aeba7b8':
libagl: support multilib build
2014-02-18 21:35:25 +00:00
Colin Cross
913a17fd5f
Merge "libagl: support multilib build"
2014-02-18 21:29:50 +00:00
Colin Cross
505350b150
am 8a9a2e24
: am d5fe844b
: Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries"
...
* commit '8a9a2e24db868fba404049d700ae704b0982e5f3':
Use /(vendor|system)/lib64/egl for 64-bit EGL libraries
2014-02-18 20:25:54 +00:00
Colin Cross
8a9a2e24db
am d5fe844b
: Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries"
...
* commit 'd5fe844b41778bf87101fc0a0e4e37e779678c50':
Use /(vendor|system)/lib64/egl for 64-bit EGL libraries
2014-02-18 20:21:35 +00:00
Colin Cross
d5fe844b41
Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries"
2014-02-18 20:14:41 +00:00
Dan Willemsen
8edb8f5f2d
Use /(vendor|system)/lib64/egl for 64-bit EGL libraries
...
Change-Id: Ie64806bfe4ba60a3167b84685cf983d4ada1042d
2014-02-16 10:29:40 -08:00
Arve Hjønnevåg
f50b9eaaee
Binder: Make sure binder objects do not overlap
...
Fixes crashing part of bug 11355082.
The driver still leaks references.
Change-Id: Ibc6a63b151c1fc1f7666237f25255ba781e02071
2014-02-15 03:44:17 +00:00
Colin Cross
ff75a8000c
libagl: support multilib build
...
Use LOCAL_SRC_FILES_arch and LOCAL_CFLAGS_arch to support building
for multiple architectures.
Change-Id: I829c1bea880739bf8184df4006d0a481ffccc5c2
2014-02-14 17:29:22 -08:00
Dan Stoza
c701401f8c
Allow disabling layer rotation during screenshots
...
Add the ability to ignore layers' transformation matrices during
screenshot capture, which will allow the window manager to capture
unrotated images for recents during the device rotation animation.
Bug: 11805195
Change-Id: I854d87bc84ca06ef9a054a454af1c080ee66fbb8
2014-02-14 23:10:42 +00:00
Dianne Hackborn
20c7adbfaa
am b37b312b
: am 7d86b454
: Merge "frameworks/native: move idmap to frameworks/base"
...
* commit 'b37b312b829c7ab5107c2f96d0a95a557f67a831':
frameworks/native: move idmap to frameworks/base
2014-02-14 02:00:17 +00:00
Dianne Hackborn
b37b312b82
am 7d86b454
: Merge "frameworks/native: move idmap to frameworks/base"
...
* commit '7d86b45472898373bbe3ef03286b66d71ea82b79':
frameworks/native: move idmap to frameworks/base
2014-02-14 01:54:37 +00:00
Dianne Hackborn
7d86b45472
Merge "frameworks/native: move idmap to frameworks/base"
2014-02-14 01:45:28 +00:00
Nick Kralevich
165c8bdfb5
am 0e4d2885
: am 2044ac43
: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
...
* commit '0e4d2885a34d31f5dbe5a08bdb654953abaf82a2':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-13 00:16:04 +00:00
Nick Kralevich
0e4d2885a3
am 2044ac43
: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
...
* commit '2044ac43e53b517526b3c70dc4fbc60ffc01693f':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-12 23:15:07 +00:00
Nick Kralevich
2044ac43e5
Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
2014-02-12 23:09:45 +00:00
Colin Cross
07a4728150
frameworks/native: move idmap to frameworks/base
...
idmap depends on libandroidfw, so it should go in frameworks/base.
Change-Id: Ieee30ba9d8170d3118acc89f0617981228a6974b
2014-02-11 18:04:03 -08:00
Jeff Brown
87c01edaf6
Merge "Add support for injecting events into ActivityContainers."
2014-02-12 00:35:43 +00:00
Jeff Brown
96e495bda3
am eac45b8a
: (-s ours) am ed4d28dd
: Add method to apply offset to PointerCoords. (DO NOT MERGE)
...
* commit 'eac45b8a53e8a17b6c9a1e7bb69a8a791073c007':
Add method to apply offset to PointerCoords. (DO NOT MERGE)
2014-02-12 00:31:55 +00:00
Jeff Brown
eac45b8a53
am ed4d28dd
: Add method to apply offset to PointerCoords. (DO NOT MERGE)
...
* commit 'ed4d28dd70448b13eb74a3166ec8d1c1a530e2d4':
Add method to apply offset to PointerCoords. (DO NOT MERGE)
2014-02-12 00:26:19 +00:00
Jeff Brown
f086ddbb97
Add support for injecting events into ActivityContainers.
...
Enhanced the input system to support concurrent dispatch of touch
events on multiple displays which is required for this to work.
Add method to apply offset to PointerCoords.
Change-Id: I55fe4a9a8785ae5a2d3341d214fa3c5107f3963a
2014-02-11 14:51:24 -08:00
Jeff Brown
ed4d28dd70
Add method to apply offset to PointerCoords. (DO NOT MERGE)
...
Change-Id: I3dc2ba22b026e5b8e1c3d90f7366ec09a59ce6b6
2014-02-11 14:43:19 -08:00
Dianne Hackborn
297097957f
am 6e5fdb15
: am 6c14f0ad
: Merge "Runtime resource overlay, iteration 2"
...
* commit '6e5fdb1551ca7d117bf7e1acca133a077a8701f0':
Runtime resource overlay, iteration 2
2014-02-11 21:49:02 +00:00
Dianne Hackborn
6e5fdb1551
am 6c14f0ad
: Merge "Runtime resource overlay, iteration 2"
...
* commit '6c14f0ad82be418c742e56fe586657ea0f394b05':
Runtime resource overlay, iteration 2
2014-02-11 21:41:23 +00:00
Dianne Hackborn
6c14f0ad82
Merge "Runtime resource overlay, iteration 2"
2014-02-11 21:27:36 +00:00
Dianne Hackborn
667c3a19d8
am 99188064
: am 340aa8cb
: Merge "New command line tool \'idmap\'"
...
* commit '99188064fd3b2d4ca85b02afefa4adb2562f8940':
New command line tool 'idmap'
2014-02-11 20:41:09 +00:00
Dianne Hackborn
99188064fd
am 340aa8cb
: Merge "New command line tool \'idmap\'"
...
* commit '340aa8cbd4afbb68b16f369336cc1c202582f021':
New command line tool 'idmap'
2014-02-11 20:35:42 +00:00
Dianne Hackborn
340aa8cbd4
Merge "New command line tool 'idmap'"
2014-02-11 20:29:56 +00:00
Michael Wright
d02c5b6aac
Move inputservice over to frameworks/native
...
Add all of the underlying input system pieces, minux PointerController and
SpriteController, to inputflinger. This is in preparation for moving input to
its own process and the addition of the input HAL.
Try 2.
Change-Id: I5f571fe86eb570885ae994e1f0552fb558930346
2014-02-11 10:47:14 -08:00
Michael Wright
1b1fe314c4
Revert "Move inputservice over to frameworks/native"
...
This reverts commit 2dceb67f1f
.
2014-02-10 15:08:18 -08:00
Michael Wright
2dceb67f1f
Move inputservice over to frameworks/native
...
Add all of the underlying input system pieces, minux PointerController and
SpriteController, to inputflinger. This is in preparation for moving input to
its own process and the addition of the input HAL.
Change-Id: I1419a740b38756bd0d54fef5f5ca337e6815b1b0
2014-02-10 14:12:49 -08:00
Michael Wright
1c284a9431
Add contains point method to Region
...
Change-Id: I553433ff7ac39f14ffca8278960d2abc95b4dd63
2014-02-10 13:00:14 -08:00