Narayan Kamath
c2ac5897ec
am 065e9c86
: Merge "Fix mips build for libbinder."
...
* commit '065e9c86e249beac08783c7e9334d5709e2c9080':
Fix mips build for libbinder.
2014-06-04 17:28:38 +00:00
Narayan Kamath
065e9c86e2
Merge "Fix mips build for libbinder."
2014-06-04 14:53:08 +00:00
Narayan Kamath
2f1f742b90
Fix mips build for libbinder.
...
Mips specific code was using an uninitialized variable.
(cherry picked from commit 2c68d380c9
)
Change-Id: I6b562b3f6d2084b72e747736cbf43684c2049f8e
2014-06-04 15:34:16 +01:00
Narayan Kamath
87947be618
Merge "Fix mips build for libbinder."
2014-06-04 14:32:59 +00:00
Narayan Kamath
2c68d380c9
Fix mips build for libbinder.
...
Mips specific code was using an uninitialized variable.
Change-Id: I445043c76ebfa420b26376ade60f8068b4ea0b11
2014-06-04 15:05:13 +01:00
Mark Salyzyn
b09b936d8e
am f0a24759
: am a28750ee
: Merge "binder: Turn on -Werror"
...
* commit 'f0a2475905786d5457e7af838ac714acbfdafa4f':
binder: Turn on -Werror
2014-06-03 20:54:48 +00:00
Mark Salyzyn
f0a2475905
am a28750ee
: Merge "binder: Turn on -Werror"
...
* commit 'a28750eec38c848230adfeef28725b29cc36a9da':
binder: Turn on -Werror
2014-06-03 20:48:35 +00:00
Mark Salyzyn
d4ecccfd20
binder: Turn on -Werror
...
Change-Id: I0ee785927a7ae5f731b02176b0b781b87c22a24e
2014-06-03 11:11:45 -07:00
Narayan Kamath
db1972bd8e
am 26063a91
: am f1dd859b
: Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
...
* commit '26063a9155ddd18d858cea7fac7c1ddf71e1bcb7':
x86_64: Align uint64_t/int64_t structure member to 8 bytes
2014-06-03 13:58:40 +00:00
Narayan Kamath
26063a9155
am f1dd859b
: Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
...
* commit 'f1dd859baa114995bcbcfb7119e939d0b4f45ed5':
x86_64: Align uint64_t/int64_t structure member to 8 bytes
2014-06-03 13:29:00 +00:00
Narayan Kamath
f1dd859baa
Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
2014-06-03 10:06:55 +00:00
Mark Salyzyn
edcf7f4d3a
binder: rm utils/Debug.h as unutilized
...
Change-Id: I52eb8b64b71cec7ffd4560e902daf358fda98b4a
2014-05-30 16:51:18 +00:00
Narayan Kamath
403ec9f15a
Fix flattening/unflattening of android::Sensor.
...
Write string lengths as uint32_t so that their width is
the same on 32 and 64 bit processes.
Note that this fixes another bug as a side effect; getFlattenedSize
was assuming that sizeof(uint32_t) == sizeof(size_t).
Change-Id: I7b6e3993e1f1ac45c14832ce59c59e0772855a2f
2014-05-30 14:40:13 +01:00
Fengwei Yin
83e0e425c6
x86_64: Align uint64_t/int64_t structure member to 8 bytes
...
To make sure the stature which pass between 32/64bit process have
same memory layout for 32/64bit.
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
Co-Authored-by: Narayan Kamath <narayan@google.com> (Unit test only.)
Change-Id: I1bc2d12cce41ec0bc484adcaf968f274bec75c12
2014-05-30 14:13:29 +01:00
Mark Salyzyn
b8b3c536f4
am ea3f1da9
: am 1ce5ecbe
: am 63645c69
: Merge "binder: rm utils/Debug.h"
...
* commit 'ea3f1da9013b33ecf3f3f8771393c1754a9aec59':
binder: rm utils/Debug.h
2014-05-29 21:09:57 +00:00
Mark Salyzyn
ea3f1da901
am 1ce5ecbe
: am 63645c69
: Merge "binder: rm utils/Debug.h"
...
* commit '1ce5ecbe3286380f5ff7ace289369ed006e9b40a':
binder: rm utils/Debug.h
2014-05-29 21:06:36 +00:00
Mark Salyzyn
1ce5ecbe32
am 63645c69
: Merge "binder: rm utils/Debug.h"
...
* commit '63645c69e03cf3862c52cfde6cbd5f5143ccd38a':
binder: rm utils/Debug.h
2014-05-29 20:29:32 +00:00
Mark Salyzyn
317ff37cf7
binder: rm utils/Debug.h
...
Change-Id: I16931919a26c16a0d701771c93fa7fe1c6f60ef8
2014-05-29 13:10:03 -07:00
Dan Stoza
3d5c8a98c1
Merge "SurfaceFlinger: Add sourceCrop to screenshot"
2014-05-28 18:31:40 +00:00
Aravind Akella
d9441e4c27
Surface maxDelay and isWakeUpSensor flag in Sensor.java.
...
Change-Id: Idd1e9045190beeca87b086b272e8cbf0bed05bae
2014-05-23 18:58:01 -07:00
Dan Stoza
c18790018b
SurfaceFlinger: Add sourceCrop to screenshot
...
Adds a sourceCrop Rect parameter to screenshot commands, which allows
clients to capture only a portion of the screen instead of the whole
screen.
Bug: 15137922
Change-Id: I629447573cd34ffb96334cde7ba02490b9ea06d8
2014-05-23 09:19:03 -07:00
Narayan Kamath
f8c66b4bee
am cfba3bf1
: am c9fcaf37
: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
...
* commit 'cfba3bf1606dfdb1daf1be1c19176180660ae19d':
Change InputMessage.motion.pointerSize to a uint32_t.
2014-05-16 12:10:21 +00:00
Narayan Kamath
cfba3bf160
am c9fcaf37
: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
...
* commit 'c9fcaf3751af078ad730913304431197e4d1ae80':
Change InputMessage.motion.pointerSize to a uint32_t.
2014-05-16 12:08:06 +00:00
Narayan Kamath
ed5fd384b7
Change InputMessage.motion.pointerSize to a uint32_t.
...
This ensures it's the same size in both 32 and 64 bit
processes and also brings it in line with struct
MotionEntry.
(cherry-picked from bc6001b026
)
Change-Id: I28e87050478920a54132efbbb8138076ebad1409
2014-05-16 12:53:16 +01:00
Aravind Akella
d763fc7822
am 47d871b2
: am d35e3af0
: Set default values for FifoMaxEventCount and ReservedEventCount.
...
* commit '47d871b2795f714499a34ffe85b67f8577883f7b':
Set default values for FifoMaxEventCount and ReservedEventCount.
2014-05-13 00:54:50 +00:00
Aravind Akella
47d871b279
am d35e3af0
: Set default values for FifoMaxEventCount and ReservedEventCount.
...
* commit 'd35e3af04d4b7e850a3b87b2211d1a3993f9b76f':
Set default values for FifoMaxEventCount and ReservedEventCount.
2014-05-13 00:50:40 +00:00
Aravind Akella
d35e3af04d
Set default values for FifoMaxEventCount and ReservedEventCount.
...
Change-Id: I4f610c2912ffe1697d1ffb99c556d1c88578466e
2014-05-12 17:15:59 -07:00
Etienne Le Grand
f63cbbf0e4
Merge "Add wake gesture in Sensor.cpp"
2014-05-12 19:38:13 +00:00
Greg Hackmann
f974bffb36
am 38c9e132
: am c1ffd351
: am bd20e551
: Merge "Use asynchronous lock/unlock API"
...
* commit '38c9e1327a5b24267c3dab5293bc9d7ada6e9fc9':
Use asynchronous lock/unlock API
2014-05-12 18:18:47 +00:00
Greg Hackmann
38c9e1327a
am c1ffd351
: am bd20e551
: Merge "Use asynchronous lock/unlock API"
...
* commit 'c1ffd351bc44483369271c11dd4c6391bba8c64c':
Use asynchronous lock/unlock API
2014-05-12 18:12:34 +00:00
Greg Hackmann
c1ffd351bc
am bd20e551
: Merge "Use asynchronous lock/unlock API"
...
* commit 'bd20e551f64234142e1146f9fa4b2dcebbd72122':
Use asynchronous lock/unlock API
2014-05-12 18:08:13 +00:00
Francis Hart
8f3960179c
Use asynchronous lock/unlock API
...
The gralloc API now provides a way for using lock/unlock with the Android
explicit synchronisation concept. This changes updates the GraphicBuffer class
to also expose this functionality, and updates the Surface class to make use of
in line with the dequeueBuffer/queueBuffer mechanism.
This new behaviour is dependent on GRALLOC_MODULE_API_VERSION_0_3. If the local
gralloc module does not support this then the existing synchronous lock/unlock
mechanism will be used.
Change-Id: I8c3fd9592e0c5400ac9be84450f55a77cc0bbdc5
2014-05-12 09:13:03 -07:00
Greg Hackmann
2f3dca149a
am 9493d492
: am 9eb142e3
: am a9d49f99
: Merge "Revert "Use asynchronous lock/unlock API""
...
* commit '9493d4924a59f14b698389386337a9c07a7ea3c4':
Revert "Use asynchronous lock/unlock API"
2014-05-09 22:00:04 +00:00
Greg Hackmann
02528cf6aa
am 4b46776f
: am 8a6cd189
: am f60564a1
: Merge "Use asynchronous lock/unlock API"
...
* commit '4b46776ff88c5a365700b88e8b2b04e1b2c77e6e':
Use asynchronous lock/unlock API
2014-05-09 21:54:48 +00:00
Greg Hackmann
9493d4924a
am 9eb142e3
: am a9d49f99
: Merge "Revert "Use asynchronous lock/unlock API""
...
* commit '9eb142e34a5bc11508c0bd6f60ad3933c60aa530':
Revert "Use asynchronous lock/unlock API"
2014-05-09 21:51:51 +00:00
Greg Hackmann
9eb142e34a
am a9d49f99
: Merge "Revert "Use asynchronous lock/unlock API""
...
* commit 'a9d49f99e69d8fc0e60b492b131322c96f47a232':
Revert "Use asynchronous lock/unlock API"
2014-05-09 21:46:44 +00:00
Greg Hackmann
a9d49f99e6
Merge "Revert "Use asynchronous lock/unlock API""
2014-05-09 21:39:07 +00:00
Greg Hackmann
53ec72523a
Revert "Use asynchronous lock/unlock API"
...
This reverts commit 378ef07760
.
Change-Id: I1de5ab973b5383633e75924fe90ac3ca8216c36a
2014-05-09 21:36:48 +00:00
Greg Hackmann
4b46776ff8
am 8a6cd189
: am f60564a1
: Merge "Use asynchronous lock/unlock API"
...
* commit '8a6cd189034ec4709a66e581b41deba56c028291':
Use asynchronous lock/unlock API
2014-05-09 21:13:16 +00:00
Greg Hackmann
8a6cd18903
am f60564a1
: Merge "Use asynchronous lock/unlock API"
...
* commit 'f60564a13e917877c76c99294194a621d872076b':
Use asynchronous lock/unlock API
2014-05-09 21:08:39 +00:00
Greg Hackmann
f60564a13e
Merge "Use asynchronous lock/unlock API"
2014-05-09 21:02:21 +00:00
Ying Wang
f736f2f5da
am 114d71ce
: am 214b4a61
: am 8155ce81
: Merge "Remove unused LOCAL_LDLIBS."
...
* commit '114d71ce7c6ec1ce0327c812a42966c4258b4a46':
Remove unused LOCAL_LDLIBS.
2014-05-08 18:23:58 +00:00
Etienne Le Grand
e284a90f50
Add wake gesture in Sensor.cpp
...
Change-Id: Ifb1744acffc2d57da43112fb9966261e8246d6de
2014-05-07 19:49:05 -07:00
Ying Wang
114d71ce7c
am 214b4a61
: am 8155ce81
: Merge "Remove unused LOCAL_LDLIBS."
...
* commit '214b4a61ac3fa63e35c79157d3acf0d8b692b3ac':
Remove unused LOCAL_LDLIBS.
2014-05-07 23:01:19 +00:00
Ying Wang
214b4a61ac
am 8155ce81
: Merge "Remove unused LOCAL_LDLIBS."
...
* commit '8155ce81d4b150e6e453d9443f9fea4cc2c546d2':
Remove unused LOCAL_LDLIBS.
2014-05-07 22:54:27 +00:00
Ying Wang
4a793fe952
Remove unused LOCAL_LDLIBS.
...
Change-Id: I62904c410a66f256da8253764577acae18f964f8
2014-05-07 15:26:38 -07:00
Narayan Kamath
c6e0c64632
Merge "Fix InputEvent_test."
2014-05-07 08:16:44 +00:00
Dan Stoza
dd02391756
Merge "Enable changing display configuration"
2014-05-06 21:08:16 +00:00
Narayan Kamath
b8290c2642
Fix InputEvent_test.
...
Axis 0 sets the MSB and Axis 63 sets the LSB, and not
the other way round like the test expects.
This was broken by commit 38dcdff308
which moved this
code over to using BitSet.
Change-Id: I63a72abe7ce14720b0bf26e5f6d651bb42452f79
2014-05-06 11:42:16 +01:00
Narayan Kamath
4522f5749d
Merge "Change InputMessage.motion.pointerSize to a uint32_t."
2014-05-06 10:00:57 +00:00
Dan Stoza
7f7da32569
Enable changing display configuration
...
This allows querying and switching display device configurations
through the ISurfaceComposer/SurfaceComposerClient interface.
Bug: 14320401
Change-Id: I8c22165698950e5da32204c1c4da92122f91a715
2014-05-05 16:45:26 -07:00
Jesse Hall
9fdfa60aaf
am 424b093a
: am ef923fcf
: Merge "fix GraphicBuffer::flatten crash issue when handle is null"
...
* commit '424b093a58c9f428081da991afa347183bf07847':
fix GraphicBuffer::flatten crash issue when handle is null
2014-05-05 22:51:27 +00:00
Jesse Hall
424b093a58
am ef923fcf
: Merge "fix GraphicBuffer::flatten crash issue when handle is null"
...
* commit 'ef923fcfd3db9ca1d7df48273cf9a6258aaf15c2':
fix GraphicBuffer::flatten crash issue when handle is null
2014-05-05 22:48:50 +00:00
Jesse Hall
ef923fcfd3
Merge "fix GraphicBuffer::flatten crash issue when handle is null"
2014-05-05 22:45:50 +00:00
Jesse Hall
13de7f1def
am 57fdbbda
: am 4314ccd1
: am 70278fbf
: Merge "Add error message for hints when exceptions occur during binder transactions."
...
* commit '57fdbbda2c475d2abdd828177f942ddb6d164bef':
Add error message for hints when exceptions occur during binder transactions.
2014-05-05 17:33:01 +00:00
Jesse Hall
57fdbbda2c
am 4314ccd1
: am 70278fbf
: Merge "Add error message for hints when exceptions occur during binder transactions."
...
* commit '4314ccd1ba9fe773b0fc91f0a08dc536ebce8dfe':
Add error message for hints when exceptions occur during binder transactions.
2014-05-05 17:30:19 +00:00
Jesse Hall
4314ccd1ba
am 70278fbf
: Merge "Add error message for hints when exceptions occur during binder transactions."
...
* commit '70278fbfe012c1fce3e63a41ffb9feaf1e53a64a':
Add error message for hints when exceptions occur during binder transactions.
2014-05-05 17:27:46 +00:00
Francis Hart
378ef07760
Use asynchronous lock/unlock API
...
The gralloc API now provides a way for using lock/unlock with the Android
explicit synchronisation concept. This changes updates the GraphicBuffer class
to also expose this functionality, and updates the Surface class to make use of
in line with the dequeueBuffer/queueBuffer mechanism.
This new behaviour is dependent on GRALLOC_MODULE_API_VERSION_0_3. If the local
gralloc module does not support this then the existing synchronous lock/unlock
mechanism will be used.
Change-Id: I77daa1beb197b63b1c2f281b8414ac4ae4b5b03c
2014-05-02 13:28:14 -07:00
Narayan Kamath
bc6001b026
Change InputMessage.motion.pointerSize to a uint32_t.
...
This ensures it's the same size in both 32 and 64 bit
processes and also brings it in line with struct
MotionEntry.
Change-Id: I66bb8b8d8664763e7dcbd489686051f563d5e1dc
2014-05-02 17:58:43 +01:00
Michael Wright
32ccf558ce
Merge "Move key attribute information out of native."
2014-04-29 22:31:18 +00:00
Bill Yi
e4f00b2aae
Merge commit '6d05ef2310bdc84811d5b0385b009ad11447a749' into HEAD
2014-04-29 11:34:19 -07:00
Jun Jiang
abf8a2c608
Add error message for hints when exceptions occur during binder transactions.
...
It can help to detect some kind of error, such as why GraphicBuffer::flatten
will crash when handle is null.
Change-Id: I703cd035b96edb7afb324cf24d8230d4e55f4f52
Signed-off-by: Jun Jiang <jun.a.jiang@intel.com>
2014-04-29 14:22:10 +08:00
Jun Jiang
e2d1157381
fix GraphicBuffer::flatten crash issue when handle is null
...
Change-Id: I0d3727e4366cac355791e52cb7790bf8f3c51527
Signed-off-by: Jun Jiang <jun.a.jiang@intel.com>
2014-04-29 14:15:36 +08:00
Aravind Akella
943de2f71b
Merge "Enable wakeup sensors."
2014-04-24 00:41:08 +00:00
Aravind Akella
9a844cf78f
Enable wakeup sensors.
...
SensorService should hold a wakelock till the app reads events from a wakeup sensor. Currently drivers hold a wakelock with a
timeout while delivering events from a wake up sensor like Significant Motion. This hack can be removed now.
Bug: 9774884
Change-Id: If3b5acb99c9cf0cd29012fcfa9d6b04c74133d01
2014-04-23 14:38:56 -07:00
Michael Wright
872db4f11e
Move key attribute information out of native.
...
Native doesn't ever actually care about the attributes of keys, so
move all of it up into the managed layer and move all of the key
names down so they're defined once.
Change-Id: Ic8ded13ce050b2b98744735ff50d11e8d882d7d5
2014-04-22 16:55:36 -07:00
Dan Stoza
e0d5862ad8
Remove deprecated BufferQueue constructor
...
Finally remove the BufferQueue constructor itself. From now on, all
BufferQueues must be created through the createBufferQueue method.
Bug: 13415624
Change-Id: I192bf9430265bab761dcd59db1f02c9d0ac4feed
2014-04-22 14:12:55 -07:00
Dan Stoza
4cbf3c5344
Merge "BufferQueue: Guard against unbounded queue growth"
2014-04-21 21:40:33 +00:00
Dan Stoza
fb39827ebc
Merge "BufferQueue: Increase max slots from 32 to 64"
2014-04-21 16:11:22 +00:00
Dan Stoza
ae3c368233
BufferQueue: Guard against unbounded queue growth
...
Adds logic to dequeueBuffer that blocks if there are currently too
many buffers in the queue. This prevents unbounded growth around
times where the slots are cleared but the queue is not (e.g.,
during rapid connect/disconnect or setBufferCount activity). This
replaces the fix from ag/377958 in a more general way.
Bug: 11293214
Change-Id: Ieb7adfcd076ff7ffe3d4d369397b2c29cf5099c3
2014-04-18 15:50:43 -07:00
Dan Stoza
017a538516
Merge "libgui: Remove unnecessary casts in SurfaceControl"
2014-04-18 20:33:52 +00:00
Dan Stoza
febd4f4f46
BufferQueue: Increase max slots from 32 to 64
...
Increases NUM_BUFFER_SLOTS from 32 to 64 and changes the mask
returned by IGBC::getReleasedBuffers from 32 to 64 bits.
Bug: 13174352
Change-Id: Ie8ef0853916cfb91f83881c7241886bb1950f01a
2014-04-18 11:40:14 -07:00
Dan Stoza
d2f81358d3
Merge "BufferQueue: Add StreamSplitter"
2014-04-18 17:20:31 +00:00
Dan Stoza
76173383e1
Merge "BufferQueueProducer: add detachNextBuffer"
2014-04-18 16:09:10 +00:00
Colin Cross
c3911c6fa6
am b8ceeb8f
: am 85085cd6
: Merge "libui: fix passing Fence object over binder"
...
* commit 'b8ceeb8f6cc3eea53d4b471747c401b9ae54d931':
libui: fix passing Fence object over binder
2014-04-15 20:52:27 +00:00
Dan Stoza
99b18b447d
BufferQueue: Add StreamSplitter
...
Adds a StreamSplitter class, that takes one IGraphicBufferConsumer
interface and multiple IGraphicBufferProducer interfaces and
implements a one-to-many broadcast of GraphicBuffers (while managing
fences correctly).
Change-Id: I38ecdf3e311ac521bc781c30dde0cc382a4376a3
2014-04-15 10:34:10 -07:00
Dan Stoza
d9822a3843
BufferQueueProducer: add detachNextBuffer
...
Adds a new method, IGBP::detachNextBuffer, that effectively does
dequeue + request + detach in a single call, but does not need to
know anything about the dequeued buffer, and will not block on
dequeue. This is mostly for the upcoming StreamSplitter to use in
its onBufferReleased callback.
Change-Id: Ie88a69de109003acebaa486a5b44c8a455726550
2014-04-15 10:27:25 -07:00
Colin Cross
b8ceeb8f6c
am 85085cd6
: Merge "libui: fix passing Fence object over binder"
...
* commit '85085cd6dd5ffed556e0a044ccf4080fbe7c5981':
libui: fix passing Fence object over binder
2014-04-15 02:17:28 +00:00
Colin Cross
288f2ef629
libui: fix passing Fence object over binder
...
The Fence object was writing a size_t into the binder buffer
in flatten, which changes size if the producer and consumer
are running in a 32-bit and a 64-bit process. Use a uint32_t
instead.
Change-Id: Ifed526513800ce27f9d605101cddd922292cca37
2014-04-14 19:06:47 -07:00
Dan Stoza
7f605bd4c0
Merge "BufferQueue: Hook up IProducerListener"
2014-04-14 16:26:43 +00:00
Aravind Akella
93b84e39e6
am ef89f763
: am cf818ebb
: Merge "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors" into klp-modular-dev
...
* commit 'ef89f7638c43ce5f73e32d487bf65c3375995e3b':
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
2014-04-11 19:40:33 +00:00
Aravind Akella
ef89f7638c
am cf818ebb
: Merge "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors" into klp-modular-dev
...
* commit 'cf818ebbf07c6a20ef48d71bf82f8d4bdf3a398c':
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
2014-04-11 19:34:53 +00:00
Aravind Akella
cf818ebbf0
Merge "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors" into klp-modular-dev
2014-04-11 19:32:28 +00:00
Dan Stoza
21f18e6935
Merge "Add unique ID to GraphicBuffer"
2014-04-11 18:56:04 +00:00
Dan Stoza
fd34b65f71
Merge "BufferQueue: Add producer buffer-released callback"
2014-04-11 17:57:12 +00:00
Aravind Akella
700180487f
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
...
This reverts commit 4369a4ebd5
.
Change-Id: Ifa8619cc6873470a07a987763d818d78d4232610
2014-04-11 00:06:06 +00:00
Dan Stoza
3b3ba78c3c
libgui: Remove unnecessary casts in SurfaceControl
...
There are a number of places where we create a local
sp<SurfaceComposerClient>& to something that is already an
sp<SurfaceComposerClient>, which is redundant. This fixes that
by removing the local references.
Bug: 13814149
Change-Id: Ic558cbda651c344e5cac97022c97563928eed29c
2014-04-10 13:50:03 -07:00
Svetoslav
cf8684b206
Merge "Adding render stats APIs to UiAutomation (framework native)."
2014-04-10 19:32:44 +00:00
Svetoslav
d85084b2b6
Adding render stats APIs to UiAutomation (framework native).
...
bug:12927198
Change-Id: Ibb1c07f7d89e11281e5c1f27f412a29ac6f9c4ab
2014-04-10 12:32:19 -07:00
Wonsik Kim
4cd47b2e0e
Merge "Fix sideband stream issues"
2014-04-10 00:35:24 +00:00
Dan Stoza
fb9bf8725d
Merge "BufferQueue: Remove Bn version of create*"
2014-04-08 20:25:54 +00:00
Dan Stoza
b3d0bdf0db
BufferQueue: Remove Bn version of create*
...
It turns out that there's no reason to have both I* and Bn* versions
of the createBufferQueue method, so I removed the Bn* version.
Change-Id: I66aeb09e10458ae540ddf1f38d2d0154ea8f315b
2014-04-07 17:00:26 -07:00
Dan Stoza
5603a2fbbd
Remove deprecated BufferQueue constructor
...
Bug: 13415624
Change-Id: I153b5470b21832cebe3c617d28a4ab9c9bf3b362
2014-04-07 13:41:37 -07:00
Andy McFadden
fc9aeb8590
am 4215f434
: am 6dbcebd0
: Merge "Always release a buffer" into klp-modular-dev
...
* commit '4215f434187d518bf8c9807c9a18a7e0b617f7d2':
Always release a buffer
2014-04-07 16:58:48 +00:00
Andy McFadden
4215f43418
am 6dbcebd0
: Merge "Always release a buffer" into klp-modular-dev
...
* commit '6dbcebd0430e026fd5d99ba4b4f005bfaa9b8e2b':
Always release a buffer
2014-04-07 16:52:13 +00:00
Wonsik Kim
afe3081e0e
Fix sideband stream issues
...
- Notify a listener when sideband stream is set
- Mark a layer as visible when sideband stream is set, even though
no buffer is queued.
Change-Id: I9652bf530f2b5ce331533ec1bb3b10a815ca191c
2014-04-07 15:59:22 +09:00
Etienne Le Grand
75b332037f
am 4369a4eb
: Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
...
* commit '4369a4ebd5ae7567e7075bc82830b83178099ed5':
Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
2014-04-05 09:06:00 +00:00
Etienne Le Grand
30d6fd6b28
Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
...
This reverts commit c57a019e11
.
Change-Id: I3540565bc3e56a32cf3b176a29216cf68bb763b2
(cherry picked from commit 4369a4ebd5
)
2014-04-05 06:13:41 +00:00
Etienne Le Grand
4369a4ebd5
Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
...
This reverts commit c57a019e11
.
Change-Id: I3540565bc3e56a32cf3b176a29216cf68bb763b2
2014-04-05 05:02:22 +00:00
Etienne Le Grand
33458f72e1
am 00f4dde1
: am c57a019e
: Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
...
* commit '00f4dde1aa88576811bca79bc8242e1fc1edb333':
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
2014-04-05 03:53:51 +00:00
Etienne Le Grand
00f4dde1aa
am c57a019e
: Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
...
* commit 'c57a019e117117c5a76c772970b26cd0f5db8c6a':
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
2014-04-05 01:52:28 +00:00
Etienne Le Grand
c57a019e11
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
...
Change-Id: If0f3dbdb5d2e9378e1fed4614baee4e750d0c850
2014-04-04 16:31:09 -07:00
Andy McFadden
87a6784780
Always release a buffer
...
In GLConsumer's updateAndReleaseLocked(), we must release either
the previously-acquired buffer or the newly-acquired buffer.
Bug 13755224
Change-Id: I96adc255400ed008ba6e6ac1725ab3514c7cc8ba
2014-04-04 15:37:08 -07:00
Mark Salyzyn
cece164b23
native gui: 64-bit compile issues
...
Change-Id: I45f605ff3759fb7ae9f0a6425d557d195f93281e
2014-04-04 10:15:54 -07:00
Narayan Kamath
7f4fe6e586
am d09b2acd
: am 033bdd72
: Merge "Remove global variables from ProcessState."
...
* commit 'd09b2acdc8ca706c65984956e61c0bb333cee992':
Remove global variables from ProcessState.
2014-04-03 16:56:29 +00:00
Narayan Kamath
d09b2acdc8
am 033bdd72
: Merge "Remove global variables from ProcessState."
...
* commit '033bdd72f9f32f4bd3d282750bdc0dcfbb469959':
Remove global variables from ProcessState.
2014-04-03 14:11:31 +00:00
Narayan Kamath
162ea0e9e8
Remove global variables from ProcessState.
...
These weren't really being used and they make it
very hard to reason about who looks at command line
arguments.
Processes started via app_process (this includes all
zygote forks and the system_server) can get information
about command line arguments from the AndroidRuntime
class, which is available via a call to
AndroidRuntime::getRuntime.
bug: 13647418
Change-Id: I6f92680c3619a68c6d4b0995db4cdc9adc788e36
2014-04-03 12:29:44 +00:00
Wonsik Kim
9cfa49c954
Merge "Declare ownership of native_handle_t object"
2014-04-02 06:13:57 +00:00
Dan Stoza
d1c1036555
BufferQueue: Hook up IProducerListener
...
Actually call the producer listener's callback during
IGraphicBufferConsumer::releaseBuffer
Change-Id: Idfa6bb08d62629cd3a198318e6c6fd6a731e73ef
2014-03-31 14:10:07 -07:00
Dan Stoza
b1363d37fc
Add unique ID to GraphicBuffer
...
Adds a globally-unique ID (PID + sequence number) to every
GraphicBuffer, which will remain the same while crossing Binder,
even if the underlying handles change.
Change-Id: Ib11330a4c5e99621b82204e0adb31b9a88658426
2014-03-31 14:10:07 -07:00
Dan Stoza
f0eaf25e92
BufferQueue: Add producer buffer-released callback
...
Add a callback to the producer side, onBufferReleased, which will be
called every time the consumer releases a buffer back to the
BufferQueue. This will enable a buffer stream splitter to work
autonomously without having to block on dequeueBuffer.
The binder object used for the callback replaces the generic IBinder
token that was passed into IGraphicBufferProducer::connect to detect
the death of the producer. If a producer does not wish to listen for
buffer release events, it can pass in an instance of the
DummyProducerListener class defined in IProducerListener.h, if it even
cares about death events (BufferQueue doesn't enforce the token being
non-NULL, though perhaps we should).
Change-Id: I23935760673524abeafea2b58dccc3583b368710
2014-03-31 14:10:07 -07:00
Michael Wright
6c4e2d816b
am 773585e6
: Merge "Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE" into klp-modular-dev
...
* commit '773585e60c2e6c3e39f9f56d0d3b05eeae6dff04':
Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE
2014-03-28 19:37:39 +00:00
Glenn Kasten
80a2f03051
Merge "Allow creation of heaps that are read-only to partner"
2014-03-27 22:28:11 +00:00
Michael Wright
d0bd391146
Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE
...
Bug: 11480300
Change-Id: I5a4096970c9e588d134f05dd0eb3a9c91c836b2f
2014-03-24 17:26:52 -07:00
Dan Stoza
2443c7903c
BufferQueue: Set attached buffers as requested
...
When a buffer is attached to the producer side, it needs to be marked
as having been requested so that it can be queued successfully.
Change-Id: I90a88b332c415a57921bd094ae635afdf65bff99
2014-03-24 15:03:46 -07:00
Wonsik Kim
0ec54e156b
Declare ownership of native_handle_t object
...
Change-Id: I4e21ff8ea76cfafce943dc059c8f72b42397980e
2014-03-24 15:44:05 +09:00
Dan Stoza
1a0b861790
BufferQueue: Test remote producer and consumer
...
Adds a test that puts the BufferQueue into its own process and
connects to it over remote binder interfaces. This exposed the fact
that while IGBC was technically binderized, it didn't actually work
when flattened, so this change also fixes that.
Change-Id: I728cdb662a4273ddd3440ed6040a12560313fe68
2014-03-21 11:16:54 -07:00
Jesse Hall
f4e7008989
am 74ae7490
: am 01502981
: Merge "fix valgrind ioctl warning."
...
* commit '74ae749099a3c84f38dbe2f43e6627bb17caf5e4':
fix valgrind ioctl warning.
2014-03-20 21:05:16 +00:00
Marco Nelissen
23c2fcbbf4
am c0af9caf
: am b14d72bc
: am d070009e
: am df6774c9
: am 7c1cdbdd
: am e23f8b8f
: am 1f70863d
: am 37b44969
: Add support for writing byte arrays to parcels
...
* commit 'c0af9cafba1217e2585777964730c70e40957dcd':
Add support for writing byte arrays to parcels
2014-03-20 13:26:08 -07:00
Marco Nelissen
c0af9cafba
am b14d72bc
: am d070009e
: am df6774c9
: am 7c1cdbdd
: am e23f8b8f
: am 1f70863d
: am 37b44969
: Add support for writing byte arrays to parcels
...
* commit 'b14d72bce04e990639305890b2aca3ccad5b3ebb':
Add support for writing byte arrays to parcels
2014-03-20 13:13:23 -07:00
Marco Nelissen
b14d72bce0
am d070009e
: am df6774c9
: am 7c1cdbdd
: am e23f8b8f
: am 1f70863d
: am 37b44969
: Add support for writing byte arrays to parcels
...
* commit 'd070009ecdb9e8c58ce5d1540d5bcba5587a0448':
Add support for writing byte arrays to parcels
2014-03-20 11:11:18 -07:00
Marco Nelissen
7c1cdbdd68
am e23f8b8f
: am 1f70863d
: am 37b44969
: Add support for writing byte arrays to parcels
...
* commit 'e23f8b8f0bf32e79c1d0f9183c064ab61354c452':
Add support for writing byte arrays to parcels
2014-03-20 10:48:35 -07:00
Marco Nelissen
e23f8b8f0b
am 1f70863d
: am 37b44969
: Add support for writing byte arrays to parcels
...
* commit '1f70863d13668dc97047df15cce547ebc8435ff2':
Add support for writing byte arrays to parcels
2014-03-20 10:33:12 -07:00
Marco Nelissen
1f70863d13
am 37b44969
: Add support for writing byte arrays to parcels
...
* commit '37b44969c0ca1d00e213da685dfbb2807f2bab30':
Add support for writing byte arrays to parcels
2014-03-20 10:04:42 -07:00
Jesse Hall
74ae749099
am 01502981
: Merge "fix valgrind ioctl warning."
...
* commit '01502981cddb69b9ab7e4bf8bc66366ae0eb7035':
fix valgrind ioctl warning.
2014-03-20 16:31:37 +00:00
Jesse Hall
b0f96c4881
am 01502981
: Merge "fix valgrind ioctl warning."
...
* commit '01502981cddb69b9ab7e4bf8bc66366ae0eb7035':
fix valgrind ioctl warning.
2014-03-20 16:31:17 +00:00
Jesse Hall
01502981cd
Merge "fix valgrind ioctl warning."
2014-03-20 16:09:15 +00:00
Michael Wright
38dcdff308
Generate ACTION_CANCEL on joystick disconnect.
...
Bug: 11480300
Change-Id: I46706838eec0711c6bf345301e7b4ccbad83b063
2014-03-20 01:54:00 +00:00
Wonsik Kim
8ce5c1cc8d
Merge "Fill in sideband stream caveat"
2014-03-19 00:41:23 +00:00
Glenn Kasten
6546f2e458
Allow creation of heaps that are read-only to partner
...
Change-Id: I3c2b3d9b1671da4b9d9c58dce27e291d30703b03
2014-03-18 15:07:43 -07:00
Dan Stoza
75555b2eaf
Merge "BufferItemConsumer: Use IGBC instead of BQ"
2014-03-18 17:55:06 +00:00
Dan Stoza
14226716f2
Merge "Remove deprecated BufferQueue constructor"
2014-03-18 16:56:15 +00:00
Andy McFadden
74d8acd7fc
Merge "Added null check"
2014-03-18 15:20:24 +00:00
Andy McFadden
bc96e4714f
Added null check
...
Don't dereference "handle" if it's NULL.
Bug 13348578
Change-Id: Ifa6758616c41cf84467af6db29c779d26901a01c
2014-03-17 16:48:23 -07:00
Kenny Root
75d8406934
am ca609e43
: am 38e2aaaa
: am 5b61ad2c
: Check the padded size of the read byte array
...
* commit 'ca609e4300d88ad1e815581ebc6a478b446d3882':
Check the padded size of the read byte array
2014-03-17 23:32:59 +00:00
Kenny Root
ca609e4300
am 38e2aaaa
: am 5b61ad2c
: Check the padded size of the read byte array
...
* commit '38e2aaaa3dd62a20eb211808ae6fe45ec37ee6d5':
Check the padded size of the read byte array
2014-03-17 21:31:04 +00:00
Kenny Root
38e2aaaa3d
am 5b61ad2c
: Check the padded size of the read byte array
...
* commit '5b61ad2cda8ec8ab634ce02f388bb2d3c5ab048d':
Check the padded size of the read byte array
2014-03-17 21:28:34 +00:00
Kenny Root
9ff2aad010
am 5b61ad2c
: Check the padded size of the read byte array
...
* commit '5b61ad2cda8ec8ab634ce02f388bb2d3c5ab048d':
Check the padded size of the read byte array
2014-03-17 21:28:33 +00:00
Kenny Root
5b61ad2cda
Check the padded size of the read byte array
...
Bug: 13509200
Change-Id: Id93894fcc617ec1cd4ce66921c6e1f1c3cf40b09
2014-03-17 13:18:16 -07:00
Marco Nelissen
37b44969c0
Add support for writing byte arrays to parcels
...
b/13418320
Cherrypicked from f0190bff38
https://googleplex-android-review.git.corp.google.com/#/c/433320/
Change-Id: I2285df9e9d3dc8a6a54055b13b352b81660bf45d
2014-03-17 11:13:30 -07:00
Wonsik Kim
0ee14ca23d
Fill in sideband stream caveat
...
Change-Id: I20db8aea8f13acf31b42db08d90b338da8a5209c
2014-03-17 17:46:53 +09:00
Marco Nelissen
ce9f107c9d
am 793be12c
: am b730a452
: am f0190bff
: Add support for writing byte arrays to parcels
...
* commit '793be12c0f5a7878d1085e94e58a9c36c84f0911':
Add support for writing byte arrays to parcels
2014-03-15 00:30:46 +00:00
Marco Nelissen
793be12c0f
am b730a452
: am f0190bff
: Add support for writing byte arrays to parcels
...
* commit 'b730a45216991cf22c39451c47393b4bccae111b':
Add support for writing byte arrays to parcels
2014-03-14 23:33:08 +00:00
Marco Nelissen
446ef4bae2
am f0190bff
: Add support for writing byte arrays to parcels
...
* commit 'f0190bff38b6c29abbfc4a877442f71fc3d7dad8':
Add support for writing byte arrays to parcels
2014-03-14 23:32:45 +00:00
Marco Nelissen
b730a45216
am f0190bff
: Add support for writing byte arrays to parcels
...
* commit 'f0190bff38b6c29abbfc4a877442f71fc3d7dad8':
Add support for writing byte arrays to parcels
2014-03-14 22:55:54 +00:00
Mark Salyzyn
c45011f272
am cdbf28b3
: Merge "native frameworks: 64-bit compile issues"
...
* commit 'cdbf28b3f7f5327f4cb0eb95b8326bf4c24c87ba':
native frameworks: 64-bit compile issues
2014-03-13 23:18:43 +00:00
Mark Salyzyn
993146092f
am d4dabf87
: am cdbf28b3
: Merge "native frameworks: 64-bit compile issues"
...
* commit 'd4dabf872ac0a12e12aebae9032f7d62762c2aeb':
native frameworks: 64-bit compile issues
2014-03-13 23:12:09 +00:00
Jesse Hall
49bfda1fbd
Fix broken build for more tests
...
Change-Id: I7bdd12a833233724805d01d993541ee05caa9bf6
2014-03-13 15:09:17 -07:00
Marco Nelissen
f0190bff38
Add support for writing byte arrays to parcels
...
b/13418320
Change-Id: I2285df9e9d3dc8a6a54055b13b352b81660bf45d
2014-03-13 14:17:40 -07:00
Jesse Hall
73ed82f809
Merge "Add sideband streams to BufferQueue and related classes"
2014-03-13 20:28:17 +00:00